Fix issues with build

Author: mlykotom

baseline-profiles/app/build.gradle.kts

@@ -18,16 +18,17 @@ plugins {
  alias(libs.plugins.android.application)
  alias(libs.plugins.kotlin.android)
  alias(libs.plugins.kotlin.parcelize)
+ alias(libs.plugins.compose.compiler)
 }
 
 android {
- compileSdk = 34
+ compileSdk = 35
  namespace = "com.example.baselineprofiles_codelab"
 
  defaultConfig {
  applicationId = "com.example.baselineprofiles_codelab"
  minSdk = 21
- targetSdk = 34
+ targetSdk = 35
  versionCode = 1
  versionName = "1.0"
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -67,10 +68,6 @@ android {
  compose = true
  }
 
- composeOptions {
- kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
- }
-
  packaging {
  // Multiple dependency bring these files in. Exclude them to enable
  // our test APK to build (has no effect on our AARs)

baseline-profiles/app/src/main/java/com/example/baselineprofiles_codelab/ui/components/Button.kt

@@ -18,6 +18,7 @@ package com.example.baselineprofiles_codelab.ui.components
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.indication
@@ -92,7 +93,7 @@ fun JetsnackButton(
  minWidth = ButtonDefaults.MinWidth,
  minHeight = ButtonDefaults.MinHeight
  )
- .indication(interactionSource, rememberRipple())
+ .indication(interactionSource, LocalIndication.current)
  .padding(contentPadding),
  horizontalArrangement = Arrangement.Center,
  verticalAlignment = Alignment.CenterVertically,

baseline-profiles/build.gradle.kts

@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
  alias(libs.plugins.android.application) apply false
  alias(libs.plugins.android.test) apply false
  alias(libs.plugins.kotlin.android) apply false
  alias(libs.plugins.kotlin.parcelize) apply false
+ alias(libs.plugins.compose.compiler) apply false
 }
 
 subprojects {
@@ -30,11 +32,11 @@ subprojects {
  }
 
  tasks.withType<KotlinCompile>().configureEach {
- kotlinOptions {
- freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+ compilerOptions {
+ freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
  // Enable experimental coroutines APIs, including Flow
- freeCompilerArgs += "-opt-in=kotlin.Experimental"
- jvmTarget = JavaVersion.VERSION_17.toString()
+ freeCompilerArgs.add("-opt-in=kotlin.Experimental")
+ jvmTarget.set(JvmTarget.JVM_17)
  }
  }
 }

baseline-profiles/gradle/libs.versions.toml

@@ -23,7 +23,6 @@ androix-test-uiautomator = "2.3.0"
 coil = "2.7.0"
 # @keep
 compileSdk = "33"
-compose-compiler = "1.4.5"
 coroutines = "1.9.0"
 google-maps = "19.0.0"
 gradle-versions = "0.51.0"
@@ -135,3 +134,4 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
 version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

benchmarking/build.gradle.kts

@@ -22,6 +22,7 @@ plugins {
  alias(libs.plugins.android.test) apply false
  alias(libs.plugins.kotlin.android) apply false
  alias(libs.plugins.kotlin.parcelize) apply false
+ alias(libs.plugins.compose.compiler) apply false
 }
 
 subprojects {