From 201bd8d319a8fa202bbc14384e7d2613961eb8bd Mon Sep 17 00:00:00 2001
From: Kizito Nwose <kizitonwose@gmail.com>
Date: Tue, 18 Jun 2024 20:46:16 +0200
Subject: [PATCH] Kotlin 2.0.0

---
 .../com/kizitonwose/calendar/buildsrc/Dependencies.kt  | 10 ++++------
 compose/build.gradle.kts                               |  4 +---
 gradle/wrapper/gradle-wrapper.properties               |  4 ++--
 sample/build.gradle.kts                                |  4 +---
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Dependencies.kt b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Dependencies.kt
index d9859e17..73575d3b 100644
--- a/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Dependencies.kt
+++ b/buildSrc/src/main/java/com/kizitonwose/calendar/buildsrc/Dependencies.kt
@@ -18,14 +18,10 @@ object Android {
     val minSdkSampleApp = max(minSdkViewLibrary, minSdkComposeLibrary)
     const val targetSdk = 34
     const val compileSdk = 34
-
-    // See compose/kotlin version mapping
-    // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-    const val composeCompiler = "1.5.14"
 }
 
 object Plugins {
-    private const val agpVersion = "8.4.2"
+    private const val agpVersion = "8.5.0"
     const val androidApp = "com.android.application"
     const val androidLibrary = "com.android.library"
     const val kotlinJvm = "org.jetbrains.kotlin.jvm"
@@ -33,11 +29,13 @@ object Plugins {
     const val kotlinter = "org.jmailen.kotlinter"
     const val mavenPublish = "com.vanniktech.maven.publish"
     const val versionCheck = "com.github.ben-manes.versions"
+    const val composeCompiler = "org.jetbrains.kotlin.plugin.compose"
 
     fun PluginDependenciesSpecScope.applyRootPlugins() {
         id(androidApp).version(agpVersion).apply(false)
         id(androidLibrary).version(agpVersion).apply(false)
         id(kotlinAndroid).version(Kotlin.version).apply(false)
+        id(composeCompiler).version(Kotlin.version).apply(false)
         id(kotlinter).version("4.3.0").apply(false)
         id(mavenPublish).version("0.28.0").apply(false)
         id(versionCheck).version("0.51.0").apply(true)
@@ -45,7 +43,7 @@ object Plugins {
 }
 
 object Kotlin {
-    internal const val version = "1.9.24"
+    internal const val version = "2.0.0"
     const val stdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
 }
 
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
index d69ad895..cd7b22db 100644
--- a/compose/build.gradle.kts
+++ b/compose/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     with(com.kizitonwose.calendar.buildsrc.Plugins) {
         id(androidLibrary)
         id(kotlinAndroid)
+        id(composeCompiler)
         id(mavenPublish)
     }
 }
@@ -30,9 +31,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = Android.composeCompiler
-    }
 }
 
 dependencies {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fb5d56ba..f249f35e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 27 16:10:41 CEST 2024
+#Tue Jun 18 20:39:23 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 55cd7389..7c9804b3 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
     with(com.kizitonwose.calendar.buildsrc.Plugins) {
         id(androidApp)
         id(kotlinAndroid)
+        id(composeCompiler)
     }
 }
 
@@ -44,9 +45,6 @@ android {
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = Android.composeCompiler
-    }
 }
 
 dependencies {