Upgrades Kotlin to 2.0.0-RC1, KSP to 1.0.20

GuilhE · Apr 26, 2024 · 5d79af2 · 5d79af2
1 parent 8745e50
commit 5d79af2
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -245,6 +245,7 @@ iOSInjectionProject/
 
 ### Gradle ###
 .gradle
+.kotlin/
 
 # Ignore Gradle GUI config
 gradle-app.setting

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 # Changelog
+---
+## [1.6.0-ALPHA]
+
+- Kotlin 2.0.0-RC1
+- KSP 1.0.20
+
 ---
 
 ## [1.5.0-ALPHA]

diff --git a/README.md b/README.md
@@ -15,9 +15,9 @@ Kotlin Multiplatform and Compose Multiplatform are built upon the philosophy of
 
 ## Compatibility
 
-| Version                                                                                                                                                                                                                       | Kotlin |  KSP   | K2  | Compose Multiplatform | Xcode  |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------:|:------:|:---:|:---------------------:|:------:|
-| [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.guilhe.kmp/kmp-composeuiviewcontroller-ksp/badge.svg)](https://search.maven.org/artifact/com.github.guilhe.kmp/kmp-composeuiviewcontroller-ksp) | 1.9.23 | 1.0.19 | Yes |         1.6.1         | 15.2.0 |
+| Version                                                                                                                                                                                                                       |  Kotlin   |  KSP   | K2  | Compose Multiplatform | Xcode  |
+|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------:|:------:|:---:|:---------------------:|:------:|
+| [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.guilhe.kmp/kmp-composeuiviewcontroller-ksp/badge.svg)](https://search.maven.org/artifact/com.github.guilhe.kmp/kmp-composeuiviewcontroller-ksp) | 2.0.0-RC1 | 1.0.20 | Yes |     1.6.10-beta02     | 15.2.0 |
 
 The suffix `-ALPHA` and `-BETA` will be added to reflect JetBrain's [Compose Multiplatform stability levels](https://www.jetbrains.com/help/kotlin-multiplatform-dev/supported-platforms.html#current-platform-stability-levels-for-compose-multiplatform-ui-framework), until it becomes `STABLE`.
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,5 +12,5 @@ buildscript {
 
 allprojects {
     group = "com.github.guilhe.kmp"
-    version = "1.5.0-ALPHA"
+    version = "1.6.0-ALPHA"
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,11 @@
 [versions]
 
-kotlin = "1.9.23"
-ksp = "1.9.23-1.0.19"
-androidTools = "8.1.2"
+kotlin = "2.0.0-RC1"
+ksp = "2.0.0-RC1-1.0.20"
+androidTools = "8.3.2"
 compileTesting = "1.5.0"
 junit = "4.13.2"
-composeuiviewcontroller = "1.5.0-ALPHA"
+composeuiviewcontroller = "1.6.0-ALPHA"
 
 [plugins]
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Aug 31 12:49:13 WEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/.gitignore b/sample/.gitignore
@@ -245,6 +245,7 @@ iOSInjectionProject/
 
 ### Gradle ###
 .gradle
+.kotlin/
 
 # Ignore Gradle GUI config
 gradle-app.setting

diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -1,12 +1,11 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.ksp)
-    id("org.jetbrains.compose") version "1.6.1"
+    id("org.jetbrains.compose") version "1.6.10-beta02"
 }
 
 compose {
-    kotlinCompilerPlugin.set("1.5.10.1")
-//    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.23")
+    kotlinCompilerPlugin.set("1.5.11-kt-2.0.0-RC1")
 }
 
 kotlin {