bump AGP to 8.5.0 and Kotlin to 2.0.0.

atsushieno · Jun 27, 2024 · e0c5c89 · e0c5c89
1 parent 7d934f9
commit e0c5c89
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/androidaudioplugin-ui-compose-app/build.gradle.kts b/androidaudioplugin-ui-compose-app/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
     id ("com.android.library")
-    id ("kotlin-android")
-    id ("org.jetbrains.dokka")
+    alias(libs.plugins.org.jetbrains.kotlin.android)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.dokka)
     id ("maven-publish")
     id ("signing")
 }

diff --git a/androidaudioplugin-ui-compose/build.gradle.kts b/androidaudioplugin-ui-compose/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
     id ("com.android.library")
-    id ("kotlin-android")
-    id ("org.jetbrains.dokka")
+    alias(libs.plugins.org.jetbrains.kotlin.android)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.dokka)
     id ("maven-publish")
     id ("signing")
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,8 +16,9 @@ buildscript {
 }
 
 plugins {
-    id ("maven-publish")
-    alias(libs.plugins.kotlinAndroid) apply false
+    alias(libs.plugins.org.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.dokka) apply false
     //id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,8 +10,8 @@ android-targetSdk = "35"
 androidx-lifecycle = "2.8.2"
 accompanist-drawablepainter = "0.32.0"
 accompanist-permissions = "0.32.0"
-agp = "8.3.2"
-kotlin = "1.9.23"
+agp = "8.5.0"
+kotlin = "2.0.0"
 ndk = "26.3.11579264"
 cmake = "3.22.1"
 build-tools = "35.0.0"
@@ -71,4 +71,7 @@ oboe = { module = "com.google.oboe:oboe", version = "1.9.0" }
 ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 
 [plugins]
-kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }