From 34d373c293db368173b66b71bba0c90fe584b389 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 31 Jan 2024 16:05:00 -0500 Subject: [PATCH] Updates to Android Studio Hedgehog | 2023.1.1 Patch 2 --- .idea/kotlinc.xml | 2 +- app/build.gradle | 3 ++- benchmark/build.gradle | 2 +- build.gradle | 14 +++++++------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index f8467b458..8d81632f8 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e97e7b847..8a41b62d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -141,7 +141,8 @@ android { } composeOptions { - kotlinCompilerExtensionVersion "1.5.3" + // Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin + kotlinCompilerExtensionVersion "1.5.8" } packagingOptions { diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 61f8934fe..79f7fc1f5 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -52,7 +52,7 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.benchmark:benchmark-junit4:1.2.2' + androidTestImplementation 'androidx.benchmark:benchmark-junit4:1.2.3' androidTestImplementation project(path: ':quartz') // Add your dependencies here. Note that you cannot benchmark code diff --git a/build.gradle b/build.gradle index 219ce3db4..a4d9e0b29 100644 --- a/build.gradle +++ b/build.gradle @@ -20,13 +20,13 @@ buildscript { } plugins { - id 'com.android.application' version '8.2.1' apply false - id 'com.android.library' version '8.2.1' apply false - id 'org.jetbrains.kotlin.android' version '1.9.10' apply false - id 'org.jetbrains.kotlin.jvm' version '1.9.10' apply false - id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.10' apply false - id 'androidx.benchmark' version '1.1.1' apply false - id 'com.diffplug.spotless' version '6.22.0' apply false + id 'com.android.application' version '8.2.2' apply false + id 'com.android.library' version '8.2.2' apply false + id 'org.jetbrains.kotlin.android' version '1.9.22' apply false + id 'org.jetbrains.kotlin.jvm' version '1.9.22' apply false + id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.22' apply false + id 'androidx.benchmark' version '1.2.3' apply false + id 'com.diffplug.spotless' version '6.25.0' apply false } subprojects {