Skip to content

Commit fc0ee25

Browse files
authored
Merge pull request #35 from android/renovate/main-all
fix(deps): update all dependencies (main)
2 parents 411e0f1 + 671db25 commit fc0ee25

File tree

18 files changed

+637
-489
lines changed

18 files changed

+637
-489
lines changed

baseline-profiles/app/build.gradle.kts

+3-6
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ plugins {
1818
alias(libs.plugins.android.application)
1919
alias(libs.plugins.kotlin.android)
2020
alias(libs.plugins.kotlin.parcelize)
21+
alias(libs.plugins.compose.compiler)
2122
}
2223

2324
android {
24-
compileSdk = 34
25+
compileSdk = 35
2526
namespace = "com.example.baselineprofiles_codelab"
2627

2728
defaultConfig {
2829
applicationId = "com.example.baselineprofiles_codelab"
2930
minSdk = 21
30-
targetSdk = 34
31+
targetSdk = 35
3132
versionCode = 1
3233
versionName = "1.0"
3334
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -67,10 +68,6 @@ android {
6768
compose = true
6869
}
6970

70-
composeOptions {
71-
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
72-
}
73-
7471
packaging {
7572
// Multiple dependency bring these files in. Exclude them to enable
7673
// 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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package com.example.baselineprofiles_codelab.ui.components
1818

1919
import android.content.res.Configuration.UI_MODE_NIGHT_YES
2020
import androidx.compose.foundation.BorderStroke
21+
import androidx.compose.foundation.LocalIndication
2122
import androidx.compose.foundation.background
2223
import androidx.compose.foundation.clickable
2324
import androidx.compose.foundation.indication
@@ -92,7 +93,7 @@ fun JetsnackButton(
9293
minWidth = ButtonDefaults.MinWidth,
9394
minHeight = ButtonDefaults.MinHeight
9495
)
95-
.indication(interactionSource, rememberRipple())
96+
.indication(interactionSource, LocalIndication.current)
9697
.padding(contentPadding),
9798
horizontalArrangement = Arrangement.Center,
9899
verticalAlignment = Alignment.CenterVertically,

baseline-profiles/build.gradle.kts

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1718
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1819

1920
plugins {
2021
alias(libs.plugins.android.application) apply false
2122
alias(libs.plugins.android.test) apply false
2223
alias(libs.plugins.kotlin.android) apply false
2324
alias(libs.plugins.kotlin.parcelize) apply false
25+
alias(libs.plugins.compose.compiler) apply false
2426
}
2527

2628
subprojects {
@@ -30,11 +32,11 @@ subprojects {
3032
}
3133

3234
tasks.withType<KotlinCompile>().configureEach {
33-
kotlinOptions {
34-
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
35+
compilerOptions {
36+
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
3537
// Enable experimental coroutines APIs, including Flow
36-
freeCompilerArgs += "-opt-in=kotlin.Experimental"
37-
jvmTarget = JavaVersion.VERSION_17.toString()
38+
freeCompilerArgs.add("-opt-in=kotlin.Experimental")
39+
jvmTarget.set(JvmTarget.JVM_17)
3840
}
3941
}
4042
}

baseline-profiles/gradle/libs.versions.toml

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,52 @@
11
[versions]
2-
accompanist = "0.34.0"
3-
androidGradlePlugin = "8.2.2"
4-
androidx-activity-compose = "1.9.0"
2+
accompanist = "0.36.0"
3+
androidGradlePlugin = "8.7.3"
4+
androidx-activity-compose = "1.9.3"
55
androidx-appcompat = "1.7.0"
6-
androidx-benchmark = "1.2.4"
7-
androidx-benchmark-junit4 = "1.2.4"
8-
androidx-compose-bom = "2024.06.00"
9-
androidx-constraintlayout = "1.0.1"
10-
androidx-corektx = "1.13.1"
11-
androidx-lifecycle-runtime = "2.8.2"
12-
androidx-lifecycle-compose = "2.8.2"
13-
androidx-lifecycle-runtime-compose = "2.8.2"
14-
androidx-navigation = "2.7.7"
6+
androidx-benchmark = "1.3.3"
7+
androidx-benchmark-junit4 = "1.3.3"
8+
androidx-compose-bom = "2024.11.00"
9+
androidx-constraintlayout = "1.1.0"
10+
androidx-corektx = "1.15.0"
11+
androidx-lifecycle-runtime = "2.8.7"
12+
androidx-lifecycle-compose = "2.8.7"
13+
androidx-lifecycle-runtime-compose = "2.8.7"
14+
androidx-navigation = "2.8.4"
1515
androidx-palette = "1.0.0"
16-
androidx-test = "1.6.0"
17-
androidx-test-espresso = "3.6.0"
18-
androidx-test-ext-junit = "1.2.0"
16+
androidx-test = "1.6.1"
17+
androidx-test-espresso = "3.6.1"
18+
androidx-test-ext-junit = "1.2.1"
1919
androidx-test-ext-truth = "1.6.0"
2020
androidx-window = "1.3.0"
2121
androidxHiltNavigationCompose = "1.2.0"
2222
androix-test-uiautomator = "2.3.0"
23-
coil = "2.6.0"
23+
coil = "2.7.0"
2424
# @keep
2525
compileSdk = "33"
26-
compose-compiler = "1.4.5"
27-
coroutines = "1.8.0"
26+
coroutines = "1.9.0"
2827
google-maps = "19.0.0"
29-
gradle-versions = "0.46.0"
30-
hilt = "2.51"
28+
gradle-versions = "0.51.0"
29+
hilt = "2.53.1"
3130
hiltExt = "1.2.0"
3231
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
33-
jdkDesugar = "2.0.4"
32+
jdkDesugar = "2.1.3"
3433
junit = "4.13.2"
3534
# @pin Update in conjuction with Compose Compiler
36-
kotlin = "1.8.20"
37-
ksp = "1.8.0-1.0.9"
38-
maps-compose = "2.5.3"
35+
kotlin = "2.1.0"
36+
ksp = "2.1.0-1.0.29"
37+
maps-compose = "6.4.0"
3938
material = "1.12.0"
4039
# @keep
4140
minSdk = "21"
4241
okhttp = "4.12.0"
43-
robolectric = "4.11.1"
44-
rome = "1.18.0"
42+
robolectric = "4.14.1"
43+
rome = "2.1.0"
4544
room = "2.6.1"
46-
runtimeTracing = "1.0.0-beta01"
45+
runtimeTracing = "1.7.5"
4746
secrets = "2.0.1"
4847
# @keep
4948
targetSdk = "33"
50-
version-catalog-update = "0.8.0"
49+
version-catalog-update = "0.8.5"
5150

5251
[libraries]
5352
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
@@ -102,7 +101,7 @@ androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core",
102101
androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
103102
androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-ext-truth" }
104103
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
105-
androidx-test-runner = "androidx.test:runner:1.5.2"
104+
androidx-test-runner = "androidx.test:runner:1.6.2"
106105
androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androix-test-uiautomator" }
107106
androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
108107
coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
@@ -135,3 +134,4 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
135134
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
136135
secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
137136
version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }
137+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

baseline-profiles/gradle/spotless.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
val ktlintVersion = "0.43.0"
1818

1919
initscript {
20-
val spotlessVersion = "6.11.0"
20+
val spotlessVersion = "6.25.0"
2121

2222
repositories {
2323
mavenCentral()
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)