Merge remote-tracking branch 'origin/master'

# Conflicts:
#	CHANGELOG.md
#	imageknife/oh-package.json5
This commit is contained in:
明月清风 2023-10-19 17:21:41 +08:00
commit 9b60f940f3
5 changed files with 7 additions and 7 deletions

View File

@ -3,7 +3,7 @@
"bundleName": "com.openharmony.imageknife",
"vendor": "example",
"versionCode": 1000000,
"versionName": "2.0.5-rc.0",
"versionName": "2.1.1-rc.0",
"icon": "$media:app_icon",
"label": "$string:app_name",
"distributedNotificationEnabled": true

View File

@ -5,7 +5,7 @@
"name": "default",
"signingConfig": "default",
"compileSdkVersion": 10,
"compatibleSdkVersion": 10
"compatibleSdkVersion": 9
}
],
"buildModeSet":[

View File

@ -4,9 +4,9 @@
"name": "entry",
"description": "example description",
"repository": {},
"version": "2.0.5-rc.0",
"version": "2.1.1-rc.0",
"dependencies": {
"@ohos/imageknife": "file:../imageknife",
"@ohos/disklrucache": "^2.0.1"
"@ohos/disklrucache": "^2.0.2-rc.0"
}
}

View File

@ -16,8 +16,8 @@
"type": "module",
"version": "2.1.0-rc.1",
"dependencies": {
"@ohos/disklrucache": "^2.0.1",
"@ohos/svg": "^2.1.0",
"@ohos/disklrucache": "^2.0.2-rc.0",
"@ohos/svg": "^2.1.1-rc.0",
"@ohos/gpu_transform": "^1.0.0"
},
"tags": [

View File

@ -6,6 +6,6 @@
"name": "imageknife",
"description": "example description",
"repository": {},
"version": "2.0.5-rc.0",
"version": "2.1.1-rc.0",
"dependencies": {}
}