diff --git a/AppScope/app.json5 b/AppScope/app.json5 index b4ea1b916606b95187793398ec68098c05df86a9..901aa8c7f47e2e46c429bc2148f9ce9cdc220dbf 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,7 +3,7 @@ "bundleName": "cn.openharmony.circleimageview", "vendor": "example", "versionCode": 1000000, - "versionName": "2.1.0-rc.0", + "versionName": "2.1.0-rc.1", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/CHANGELOG.md b/CHANGELOG.md index af8eb2f8d0d6a95d76f83cff8a5523b695d47b2f..3d103ef350cf2daeacc32f3318309101a0a357a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.1.0-rc.1 +- Modified the compilation and build warning prompt +- ## 2.1.0-rc.0 - 适配V2装饰器 diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 23c476193ae5148e9c33aa45f8ec357cea403458..ace79d898bcbcb46bb670e6aa2769f06fe708d1e 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -11,7 +11,7 @@ "description": "一个图片处理的库,可以方便的将图片裁剪成圆形,也可以给图片设置边框的库", "main": "", "repository": {}, - "version": "2.1.0-rc.0", + "version": "2.1.0-rc.1", "dependencies": { "@ohos/circleimageview": "file:../library" } diff --git a/library/oh-package.json5 b/library/oh-package.json5 index 385cb81ffb2b86421a600bfba7a9de67d3f6d04e..afee6ef23d4bdb88984bf3716209c989008be2c2 100644 --- a/library/oh-package.json5 +++ b/library/oh-package.json5 @@ -13,7 +13,7 @@ "main": "index.ets", "repository": "https://gitee.com/openharmony-sig/CircleImageView", "type": "module", - "version": "2.1.0-rc.0", + "version": "2.1.0-rc.1", "tags": [ "OpenHarmony", "circleimage", diff --git a/library/src/main/ets/components/MainPage/CircleImageView.ets b/library/src/main/ets/components/MainPage/CircleImageView.ets index ddc73d415cfe36933ba574b1ddddc4d4c6a62ba4..c68d0ba2e812e9fa6da021193730a5a6b0a7b6ac 100644 --- a/library/src/main/ets/components/MainPage/CircleImageView.ets +++ b/library/src/main/ets/components/MainPage/CircleImageView.ets @@ -48,7 +48,7 @@ namespace CircleImageView { @Trace diameter: number = 0; @Trace scaleType: ImageFit = ImageFit.Contain; @Trace disableCircularTransformation: boolean = true; - @Trace circle: ESObject; + @Trace circle: CircleAttribute | null = null; @Trace color: number = 0; @Trace borderWidth: number = 0; @Trace borderColor: ResourceColor = Color.Gray; diff --git a/oh-package.json5 b/oh-package.json5 index af5c6e3e146a951d2d8a09921c659023d3e4b728..1f9cf9d7a727fd7e4c303e47cf9f7084b978db17 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -1,4 +1,5 @@ { + "modelVersion": "5.0.2", "license": "Apache License 2.0", "devDependencies": { "@ohos/hypium": "1.0.6" @@ -13,6 +14,6 @@ "description": "一个图片处理的库,可以方便的将图片裁剪成圆形,也可以给图片设置边框的库", "main": "", "repository": {}, - "version": "2.1.0-rc.0", + "version": "2.1.0-rc.1", "dependencies": {} -} +} \ No newline at end of file