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", "bundleName": "com.openharmony.imageknife",
"vendor": "example", "vendor": "example",
"versionCode": 1000000, "versionCode": 1000000,
"versionName": "2.0.5-rc.0", "versionName": "2.1.1-rc.0",
"icon": "$media:app_icon", "icon": "$media:app_icon",
"label": "$string:app_name", "label": "$string:app_name",
"distributedNotificationEnabled": true "distributedNotificationEnabled": true

View File

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

View File

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

View File

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

View File

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