Skip to content

Commit

Permalink
Update Kotlin to 1.9.0-RC.
Browse files Browse the repository at this point in the history
  • Loading branch information
bennyhuo committed Jul 3, 2023
1 parent 95ca1dd commit 00715be
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 18 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@ 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.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 | 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.1.0 | 1.8.20 | 4.2.0 | 6.8.3 |
| 1.9.0-1.1.0 | 1.9.0 | 4.2.2 | 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

Expand Down
11 changes: 6 additions & 5 deletions README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@ kace {
Kace 目前支持了以上四种最常用的类型,其他 kotlin-android-extensions 支持的类型如 android.app.Fragment, android.app.Dialog, kotlinx.android.extensions.LayoutContainer 等,由于被废弃或者使用较少,Kace 目前没有做支持

## 版本兼容
| 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 |
| 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.1.0 | 1.8.20 | 4.2.0 | 6.8.3 |
| 1.9.0-1.1.0 | 1.9.0 | 4.2.2 | 6.8.3 |

由于 Kace 的目标是帮助开发者更方便地迁移到 Kotlin 1.8,因此 Kotlin 最低支持版本比较高

Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
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.20" apply false
id("com.android.application") version "4.2.2" apply false
id("com.android.library") version "4.2.2" apply false
id("org.jetbrains.kotlin.android") version "1.9.0-RC" apply false
id("com.vanniktech.maven.publish") version "0.18.0" apply false
id("com.github.gmazzo.buildconfig") version "2.1.0" apply false
}

allprojects {
repositories {
maven { setUrl("https://mirrors.tencent.com/nexus/repository/maven-public/") }
mavenCentral()
maven { setUrl("https://oss.sonatype.org/content/repositories/snapshots/") }
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ kotlin.code.style=official
android.nonTransitiveRClass=true

KOTLIN_PLUGIN_ID=com.kanyun.kace
VERSION_NAME=1.8.20-1.1.0
VERSION_NAME=1.9.0-1.1.0-SNAPSHOT

GROUP=com.kanyun.kace

Expand Down
1 change: 0 additions & 1 deletion kace-compiler/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ dependencies {

val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions.freeCompilerArgs += listOf(
"-Xjvm-default=enable",
"-opt-in=kotlin.RequiresOptIn",
"-Xcontext-receivers"
)
Expand Down
2 changes: 1 addition & 1 deletion kace-sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.20" apply false
id("org.jetbrains.kotlin.android") version "1.9.0-RC" apply false
id("com.kanyun.kace") version "0.0.0-SNAPSHOT" apply false
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pluginManagement {
repositories {
maven { url 'https://mirrors.tencent.com/nexus/repository/maven-public/' }
mavenCentral()
gradlePluginPortal()
}
}
Expand Down

0 comments on commit 00715be

Please sign in to comment.