Merge pull request #36 from kanyun-inc/feature/kotlin-1.8.20

Feature/kotlin 1.8.20
kanyun-inc · Apr 27, 2023 · a8e31e2 · a8e31e2
2 parents 28230d0 + a633438
commit a8e31e2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -67,10 +67,11 @@ kace {
 The Kace currently supports the above four most commonly used types. Other types supported by kotlin-android-extensions such as android.app.Fragment, android.app.Dialog, kotlinx.android.extensions.LayoutContainer are deprecated or rarely used, currently not supported by the Kace
 
 ## Version compatible
-| Kace                 | Kotlin | AGP   | Gradle |
-|----------------------|--------|-------|--------|
-| 1.0.2                | 1.7.0  | 4.2.0 | 6.7.1  |
-| 1.8.0-1.0.2-SNAPSHOT | 1.8.0  | 4.2.0 | 6.8.3  |
+| Kace         | Kotlin        | AGP   | Gradle |
+|--------------|---------------|-------|--------|
+| 1.7.0-1.0.4  | 1.7.0         | 4.2.0 | 6.7.1  |
+| 1.8.0-1.0.4  | 1.8.0~1.8.10  | 4.2.0 | 6.8.3  |
+| 1.8.20-1.0.4 | 1.8.20 | 4.2.0 | 6.8.3  |
 
 Since the goal of the Kace is to help developers easily upgrade to Kotlin 1.8, the minimum supported version of Kotlin is relatively high
 

diff --git a/README_zh.md b/README_zh.md
@@ -69,8 +69,9 @@ Kace 目前支持了以上四种最常用的类型，其他 kotlin-android-exten
 ## 版本兼容
 | Kace                 | Kotlin | AGP   | Gradle |
 |----------------------|--------|-------|--------|
-| 1.0.2                | 1.7.0  | 4.2.0 | 6.7.1  |
-| 1.8.0-1.0.2-SNAPSHOT | 1.8.0  | 4.2.0 | 6.8.3  |
+| 1.7.0-1.0.4  | 1.7.0         | 4.2.0 | 6.7.1  |
+| 1.8.0-1.0.4  | 1.8.0~1.8.10  | 4.2.0 | 6.8.3  |
+| 1.8.20-1.0.4 | 1.8.20 | 4.2.0 | 6.8.3  |
 
 由于 Kace 的目标是帮助开发者更方便地迁移到 Kotlin 1.8，因此 Kotlin 最低支持版本比较高
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@
 plugins {
     id("com.android.application") version "4.2.0" apply false
     id("com.android.library") version "4.2.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.20" apply false
     id("com.vanniktech.maven.publish") version "0.18.0" apply false
     id("com.github.gmazzo.buildconfig") version "2.1.0" apply false
 }

diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 
 KOTLIN_PLUGIN_ID=com.kanyun.kace
-VERSION_NAME=1.8.0-1.0.4
+VERSION_NAME=1.8.20-1.0.4
 
 GROUP=com.kanyun.kace
 

diff --git a/kace-compiler/build.gradle.kts b/kace-compiler/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     testImplementation(kotlin("test-junit"))
     testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
 
-    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.8.0.0-SNAPSHOT")
+    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.8.0.0")
 }
 
 val compileKotlin: KotlinCompile by tasks

diff --git a/kace-sample/build.gradle.kts b/kace-sample/build.gradle.kts
@@ -2,7 +2,7 @@
 plugins {
     id("com.android.application") apply false
     id("com.android.library") apply false
-    id("org.jetbrains.kotlin.android") version "1.8.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.20" apply false
     id("com.kanyun.kace") version "0.0.0-SNAPSHOT" apply false
 }