Remove remaining Android Kotlin Plugin references

Author: bsagmoe

AdaptiveUiCodelab/app/build.gradle.kts

@@ -16,7 +16,6 @@
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
 }
 
@@ -50,9 +49,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
     buildFeatures {
         compose = true
     }

AdaptiveUiCodelab/build.gradle.kts

@@ -23,6 +23,5 @@ buildscript {
 
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.compose.compiler) apply false
 }

AdaptiveUiCodelab/gradle/libs.versions.toml

@@ -38,5 +38,4 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

PerformanceCodelab/app/build.gradle.kts

@@ -15,7 +15,6 @@
  */
 plugins {
     alias(libs.plugins.com.android.application)
-    alias(libs.plugins.org.jetbrains.kotlin.android)
     alias(libs.plugins.androidx.baselineprofile)
     alias(libs.plugins.compose)
 }
@@ -26,7 +25,7 @@ android {
 
     defaultConfig {
         applicationId = "com.compose.performance"
-        minSdk = 21
+        minSdk = 23
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"
@@ -52,9 +51,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
         isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
     buildFeatures {
         compose = true
     }

PerformanceCodelab/build.gradle.kts

@@ -3,7 +3,6 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.com.android.application) apply false
-    alias(libs.plugins.org.jetbrains.kotlin.android) apply false
     alias(libs.plugins.androidTest) apply false
     alias(libs.plugins.androidx.baselineprofile) apply false
     alias(libs.plugins.com.diffplug.spotless) apply false

PerformanceCodelab/gradle/libs.versions.toml

@@ -19,7 +19,7 @@ tracing-ktx = "1.3.0"
 tracing-perfetto = "1.0.1"
 uiautomator = "2.3.0"
 benchmark = "1.4.1"
-androidx-baselineprofile = "1.4.1"
+androidx-baselineprofile = "1.5.0-alpha03"
 profileinstaller = "1.4.1"
 material3 = "1.4.0"
 spotless = "8.2.1"
@@ -58,11 +58,7 @@ ktlint = { module = "com.pinterest.ktlint:ktlint-core", version.ref = "ktlint" }
 
 [plugins]
 com-android-application = { id = "com.android.application", version.ref = "com-android-application" }
-org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "org-jetbrains-kotlin-android" }
 androidTest = { id = "com.android.test", version.ref = "com-android-application" }
 androidx-baselineprofile = { id = "androidx.baselineprofile", version.ref = "androidx-baselineprofile" }
 com-diffplug-spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "org-jetbrains-kotlin-android" }
-
-[bundles]
-

PerformanceCodelab/measure/build.gradle.kts

@@ -17,7 +17,6 @@ import com.android.build.api.dsl.ManagedVirtualDevice
 
 plugins {
     alias(libs.plugins.androidTest)
-    alias(libs.plugins.org.jetbrains.kotlin.android)
     alias(libs.plugins.androidx.baselineprofile)
 }
 
@@ -30,10 +29,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     defaultConfig {
         minSdk = 27
         targetSdk = 34
@@ -56,11 +51,15 @@ android {
 
     targetProjectPath = ":app"
 
-    testOptions.managedDevices.devices {
-        create<ManagedVirtualDevice>("pixel6Api33") {
-            device = "Pixel 6"
-            apiLevel = 33
-            systemImageSource = "aosp"
+    testOptions {
+        managedDevices {
+            localDevices {
+                create("pixel6Api33") {
+                    device = "Pixel 6"
+                    apiLevel = 33
+                    systemImageSource = "aosp"
+                }
+            }
         }
     }
 }