Migrated to KSP from Kapt

Added legacy kapt instead of kotlin kapt for Migration Codelab
Merge branch 'main' into renovate/main-all
Merge pull request #562 from raystatic/update/toml-versioning-compose-basics-codelab

Author: srikrishnasakunia

AdvancedStateAndSideEffectsCodelab/app/build.gradle

@@ -16,8 +16,9 @@
 
 plugins {
     id 'com.android.application'
-    id 'dagger.hilt.android.plugin'
+    id 'com.google.devtools.ksp'
     id 'org.jetbrains.kotlin.plugin.compose'
+    id 'dagger.hilt.android.plugin'
 }
 
 // Reads the Google maps key that is used in the AndroidManifest
@@ -118,9 +119,9 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 
-    implementation "com.google.dagger:hilt-android:2.59"
-    kapt "com.google.dagger:hilt-compiler:2.59"
-    kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
+    implementation "com.google.dagger:hilt-android:2.59.1"
+    ksp "com.google.dagger:hilt-compiler:2.59.1"
+    ksp "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
 
     implementation "io.coil-kt:coil-compose:2.7.0"
 
@@ -131,8 +132,8 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:3.7.0"
     androidTestImplementation "androidx.test.ext:junit-ktx:1.3.0"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2"
-    androidTestImplementation "com.google.dagger:hilt-android:2.59"
-    androidTestImplementation "com.google.dagger:hilt-android-testing:2.59"
-    kaptAndroidTest "com.google.dagger:hilt-compiler:2.59"
-    kaptAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
+    androidTestImplementation "com.google.dagger:hilt-android:2.59.1"
+    androidTestImplementation "com.google.dagger:hilt-android-testing:2.59.1"
+    kspAndroidTest "com.google.dagger:hilt-compiler:2.59.1"
+    kspAndroidTest "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0"
 }

AdvancedStateAndSideEffectsCodelab/build.gradle

@@ -21,14 +21,15 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:9.0.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0"
-        classpath "com.google.dagger:hilt-android-gradle-plugin:2.59"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.59.1"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.10"
+        classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.4"
     }
 }
 
 plugins {
     id 'com.diffplug.spotless' version '8.2.1'
+    id 'com.google.devtools.ksp' version '2.3.4' apply false
 }
 
 subprojects {

MigrationCodelab/app/build.gradle

@@ -17,15 +17,16 @@
 apply plugin: 'com.android.application'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
+apply plugin: 'com.android.legacy-kapt'
 
 
 android {
-    compileSdk 36
-    minSdk 23
-    targetSdk 33
+    compileSdkVersion 36
     namespace "com.google.samples.apps.sunflower"
     defaultConfig {
         applicationId "com.google.samples.apps.sunflower"
+        minSdkVersion 23
+        targetSdkVersion 33
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         versionCode 1
         versionName "0.1.6"
@@ -34,17 +35,14 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-        freeCompilerArgs = ['-Xjvm-default=all-compatibility']
-    }
+
     buildFeatures {
         dataBinding true
         compose true

MigrationCodelab/build.gradle

@@ -30,6 +30,7 @@ buildscript {
 
 plugins {
     id 'com.diffplug.spotless' version '8.2.1'
+    id 'com.android.legacy-kapt' version '9.0.0' apply false
 }
 
 allprojects {

MigrationCodelab/settings.gradle

@@ -14,4 +14,12 @@
  * limitations under the License.
  */
 
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
 include ':app'