change android compile target to 30

alibaba · Sep 22, 2023 · 3b91c63 · 3b91c63
1 parent bde57e7
commit 3b91c63
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/GaiaXAndroid/README.md b/GaiaXAndroid/README.md
@@ -0,0 +1,7 @@
+# GaiaX
+
+## 开发环境
+
+AS： Android Studio Flamingo | 2022.2.1 Patch 2
+
+JDK: 11.0.18
diff --git a/GaiaXAndroid/build.gradle b/GaiaXAndroid/build.gradle
@@ -32,11 +32,13 @@ buildscript {
 android {
     namespace = "com.alibaba.gaiax"
 
-    compileSdkVersion 33
+    // 不能升级，否则会碰到清单文件合并错误
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        // 不能升级，否则会碰到清单文件合并错误
+        targetSdkVersion 30
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 

diff --git a/GaiaXAndroid/src/androidTest/java/com/alibaba/gaiax/GXRefactorTest.kt b/GaiaXAndroid/src/androidTest/java/com/alibaba/gaiax/GXRefactorTest.kt
@@ -48,7 +48,7 @@ class GXRefactorTest : GXBaseTest() {
             val rootView = GXTemplateEngine.instance.createView(templateItem, size)!!
             GXTemplateEngine.instance.bindData(rootView, templateData)
             Assert.assertEquals(
-                Color.RED, (rootView.background as GXColorGradientDrawable).colors[0]
+                Color.RED, (rootView.background as GXColorGradientDrawable).colors!![0]
             )
         }
 
@@ -58,7 +58,7 @@ class GXRefactorTest : GXBaseTest() {
             val rootView = GXTemplateEngine.instance.createView(templateItem, size)!!
             GXTemplateEngine.instance.bindData(rootView, templateData)
             Assert.assertEquals(
-                Color.GREEN, (rootView.background as GXColorGradientDrawable).colors[0]
+                Color.GREEN, (rootView.background as GXColorGradientDrawable).colors!![0]
             )
         }
 

diff --git a/GaiaXAndroid/src/androidTest/java/com/alibaba/gaiax/utils/GXTestLottieAnimation.kt b/GaiaXAndroid/src/androidTest/java/com/alibaba/gaiax/utils/GXTestLottieAnimation.kt
@@ -104,7 +104,7 @@ internal class GXTestLottieAnimation : GXLottieAnimation() {
         lottieView.repeatCount = loopCount
         lottieView.addAnimatorListener(object : GXDefaultAnimatorListener() {
 
-            override fun onAnimationEnd(animation: Animator?) {
+            override fun onAnimationEnd(animation: Animator) {
                 gxNode.isAnimating = false
                 lottieView.removeAllAnimatorListeners()
                 lottieView.removeAllUpdateListeners()
@@ -119,7 +119,7 @@ internal class GXTestLottieAnimation : GXLottieAnimation() {
                     })
             }
 
-            override fun onAnimationStart(animation: Animator?) {
+            override fun onAnimationStart(animation: Animator) {
                 gxTemplateContext.templateData?.eventListener?.onAnimationEvent(
                     GXTemplateEngine.GXAnimation().apply {
                         this.state = "START"
@@ -168,7 +168,7 @@ internal class GXTestLottieAnimation : GXLottieAnimation() {
                     lottieView.setComposition(it)
                     lottieView.repeatCount = loopCount
                     lottieView.addAnimatorListener(object : GXDefaultAnimatorListener() {
-                        override fun onAnimationEnd(animation: Animator?) {
+                        override fun onAnimationEnd(animation: Animator) {
                             gxNode.isAnimating = false
 
                             lottieView.removeAllAnimatorListeners()
@@ -186,7 +186,7 @@ internal class GXTestLottieAnimation : GXLottieAnimation() {
                                 })
                         }
 
-                        override fun onAnimationStart(animation: Animator?) {
+                        override fun onAnimationStart(animation: Animator) {
                             gxNode.isAnimating = true
                             gxTemplateContext.templateData?.eventListener?.onAnimationEvent(
                                 GXTemplateEngine.GXAnimation().apply {

diff --git a/GaiaXAndroidAdapter/build.gradle b/GaiaXAndroidAdapter/build.gradle
@@ -31,11 +31,13 @@ buildscript {
 
 android {
 
-    compileSdkVersion 33
+    // 不能升级，否则会碰到清单文件合并错误
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        // 不能升级，否则会碰到清单文件合并错误
+        targetSdkVersion 30
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 

diff --git a/GaiaXAndroidClientToStudio/build.gradle b/GaiaXAndroidClientToStudio/build.gradle
@@ -29,11 +29,11 @@ buildscript {
     }
 }
 android {
-    compileSdk 28
+    compileSdk 30
 
     defaultConfig {
         minSdk 16
-        targetSdk 28
+        targetSdk 30
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"