Merge pull request #13 from skydoves/kotlin/2.0.0

Update Kotlin to 2.0.0
skydoves · Jun 5, 2024 · 34b2958 · 34b2958
2 parents 2374192 + 34031d4
commit 34b2958
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 27 deletions.
diff --git a/...nsformedMetadataLibraries/org.jetbrains.kotlin-kotlin-stdlib-2.0.0-commonMain-2bbUHA.klib b/...nsformedMetadataLibraries/org.jetbrains.kotlin-kotlin-stdlib-2.0.0-commonMain-2bbUHA.klib
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -19,6 +19,7 @@ import com.github.skydoves.Configurations
 plugins {
   id(libs.plugins.android.application.get().pluginId)
   id(libs.plugins.kotlin.android.get().pluginId)
+  id(libs.plugins.compose.compiler.get().pluginId)
   id(libs.plugins.spotless.get().pluginId)
 }
 
@@ -38,10 +39,6 @@ android {
     compose = true
   }
 
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
-  }
-
   packaging {
     resources {
       excludes.add("/META-INF/{AL2.0,LGPL2.1}")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
   alias(libs.plugins.baseline.profile) apply false
   alias(libs.plugins.kotlin.multiplatform) apply false
   alias(libs.plugins.spotless) apply false
+  alias(libs.plugins.compose.compiler) apply false
   alias(libs.plugins.kotlin.binary.compatibility)
   alias(libs.plugins.nexus.plugin)
   alias(libs.plugins.dokka)

diff --git a/gradle.properties b/gradle.properties
@@ -38,6 +38,9 @@ android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
 
+# KMP
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=tru
+
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,27 +1,18 @@
 [versions]
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 dokka = "1.9.10"
 jvmTarget = "11"
 nexusPlugin = "0.25.3"
 kotlinxCoroutines = "1.7.2"
 kotlinxTime = "0.4.0"
 kotlinBinaryCompatibility = "0.13.2"
-androidGradlePlugin = "8.3.2"
+androidGradlePlugin = "8.4.1"
 androidxActivity = "1.7.2"
 androidxMaterial = "1.9.0"
 androidxComposeBom = "2024.05.00"
-androidxComposeCompiler = "1.5.11"
 androidxComposeConstraintLayout = "1.0.1"
-androidxCore = "1.12.0"
-androidxTestRunner = "1.5.2"
-androidxTestRules = "1.5.0"
-androidxJunit = "1.1.5"
 androidxMacroBenchmark = "1.2.4"
-androidxProfileinstaller = "1.3.1"
-androidxUiAutomator = "2.3.0-alpha02"
 spotless = "6.20.0"
-junit = "4.13.2"
-androidx-test-ext-junit = "1.1.5"
 
 [libraries]
 kotlinx-time = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxTime" }
@@ -33,21 +24,11 @@ androidx-compose-foundation = { group = "androidx.compose.foundation", name = "f
 androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }
 androidx-compose-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidxComposeConstraintLayout" }
-androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
-androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "androidxProfileinstaller" }
-androidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }
-
-# Dependencies of the included build-logic
-android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
-kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-spotless-gradlePlugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version.ref = "spotless" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
-android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
+#Wed Jun 05 17:07:47 KST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists