Use Compose compiler to fix kotlin 2.0 issue

mlykotom · mlykotom · commit 12792384f16c · 2024-06-14T09:52:12.000+02:00
diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -79,10 +80,6 @@ android {
         compose true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
-
     packagingOptions {
         excludes += "/META-INF/AL2.0"
         excludes += "/META-INF/LGPL2.1"
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
@@ -28,6 +28,7 @@ buildscript {
 
 plugins {
     id 'com.diffplug.spotless' version '6.25.0'
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false
 }
 
 subprojects {
diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -52,9 +53,6 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle
@@ -21,6 +21,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle
@@ -19,6 +19,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 // Reads the Google maps key that is used in the AndroidManifest
@@ -83,10 +84,6 @@ android {
         shaders false
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
-
     packagingOptions {
         // Multiple dependency bring these files in. Exclude them to enable
         // our test APK to build (has no effect on our AARs)
diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -23,6 +23,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
@@ -22,6 +22,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -39,9 +40,6 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
 }
 
 dependencies {
diff --git a/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties b/AnimationCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -39,9 +40,6 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
 }
 
 dependencies {
diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -52,9 +53,6 @@ android {
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
@@ -22,6 +22,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts
@@ -17,6 +17,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
@@ -55,9 +56,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.14"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
@@ -22,6 +22,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts
@@ -17,6 +17,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
@@ -55,9 +56,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.14"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts
@@ -18,4 +18,5 @@
 plugins {
     id("com.android.application") version "8.4.0" apply false
     id("org.jetbrains.kotlin.android") version "2.0.0" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false
 }
diff --git a/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicsCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle
@@ -18,6 +18,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
+apply plugin: 'org.jetbrains.kotlin.plugin.compose'
+
 
 android {
     compileSdkVersion 34
@@ -49,9 +51,6 @@ android {
         dataBinding true
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
     packagingOptions {
         // Multiple dependency bring these files in. Exclude them to enable
         // our test APK to build (has no effect on our AARs)
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
@@ -24,6 +24,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
@@ -23,6 +23,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue May 16 11:33:31 AEST 2023
 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.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -75,10 +76,6 @@ android {
         shaders false
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
-
     packagingOptions {
         exclude "META-INF/licenses/**"
         exclude "META-INF/AL2.0"
diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
@@ -23,6 +23,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:8.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle
@@ -17,6 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -79,10 +80,6 @@ android {
         compose true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
-    }
-
     packagingOptions {
         excludes += "/META-INF/AL2.0"
         excludes += "/META-INF/LGPL2.1"
diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
@@ -23,6 +23,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
     }
 }
 
diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle
diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
diff --git a/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelabM2/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ buildscript {`
`28`	`28`
`29`	`29`	`plugins {`
`30`	`30`	`id 'com.diffplug.spotless' version '6.25.0'`
	`31`	`+ id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ buildscript {`
`21`	`21`	`dependencies {`
`22`	`22`	`classpath "com.android.tools.build:gradle:8.4.0"`
`23`	`23`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"`
	`24`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ buildscript {`
`23`	`23`	`classpath "com.android.tools.build:gradle:8.4.0"`
`24`	`24`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"`
`25`	`25`	`classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"`
	`26`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ buildscript {`
`22`	`22`	`dependencies {`
`23`	`23`	`classpath 'com.android.tools.build:gradle:8.4.0'`
`24`	`24`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"`
	`25`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`plugins {`
`18`	`18`	`id 'com.android.application'`
`19`	`19`	`id 'kotlin-android'`
	`20`	`+ id 'org.jetbrains.kotlin.plugin.compose'`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`android {`
`@@ -39,9 +40,6 @@ android {`
`39`	`40`	`kotlinOptions {`
`40`	`41`	`jvmTarget = '1.8'`
`41`	`42`	`}`
`42`		`- composeOptions {`
`43`		`- kotlinCompilerExtensionVersion '1.5.14'`
`44`		`- }`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,5 @@`
`18`	`18`	`plugins {`
`19`	`19`	`id("com.android.application") version "8.4.0" apply false`
`20`	`20`	`id("org.jetbrains.kotlin.android") version "2.0.0" apply false`
	`21`	`+ id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ buildscript {`
`24`	`24`	`classpath "com.android.tools.build:gradle:8.4.0"`
`25`	`25`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"`
`26`	`26`	`classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"`
	`27`	`+ classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`