Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update all dependencies (main) #35

Merged
merged 4 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions baseline-profiles/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 6 additions & 4 deletions baseline-profiles/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)
}
}
}
58 changes: 29 additions & 29 deletions baseline-profiles/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,53 +1,52 @@
[versions]
accompanist = "0.34.0"
androidGradlePlugin = "8.2.2"
androidx-activity-compose = "1.9.0"
accompanist = "0.36.0"
androidGradlePlugin = "8.7.3"
androidx-activity-compose = "1.9.3"
androidx-appcompat = "1.7.0"
androidx-benchmark = "1.2.4"
androidx-benchmark-junit4 = "1.2.4"
androidx-compose-bom = "2024.06.00"
androidx-constraintlayout = "1.0.1"
androidx-corektx = "1.13.1"
androidx-lifecycle-runtime = "2.8.2"
androidx-lifecycle-compose = "2.8.2"
androidx-lifecycle-runtime-compose = "2.8.2"
androidx-navigation = "2.7.7"
androidx-benchmark = "1.3.3"
androidx-benchmark-junit4 = "1.3.3"
androidx-compose-bom = "2024.11.00"
androidx-constraintlayout = "1.1.0"
androidx-corektx = "1.15.0"
androidx-lifecycle-runtime = "2.8.7"
androidx-lifecycle-compose = "2.8.7"
androidx-lifecycle-runtime-compose = "2.8.7"
androidx-navigation = "2.8.4"
androidx-palette = "1.0.0"
androidx-test = "1.6.0"
androidx-test-espresso = "3.6.0"
androidx-test-ext-junit = "1.2.0"
androidx-test = "1.6.1"
androidx-test-espresso = "3.6.1"
androidx-test-ext-junit = "1.2.1"
androidx-test-ext-truth = "1.6.0"
androidx-window = "1.3.0"
androidxHiltNavigationCompose = "1.2.0"
androix-test-uiautomator = "2.3.0"
coil = "2.6.0"
coil = "2.7.0"
# @keep
compileSdk = "33"
compose-compiler = "1.4.5"
coroutines = "1.8.0"
coroutines = "1.9.0"
google-maps = "19.0.0"
gradle-versions = "0.46.0"
hilt = "2.51"
gradle-versions = "0.51.0"
hilt = "2.53.1"
hiltExt = "1.2.0"
# @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
jdkDesugar = "2.0.4"
jdkDesugar = "2.1.3"
junit = "4.13.2"
# @pin Update in conjuction with Compose Compiler
kotlin = "1.8.20"
ksp = "1.8.0-1.0.9"
maps-compose = "2.5.3"
kotlin = "2.1.0"
ksp = "2.1.0-1.0.29"
maps-compose = "6.4.0"
material = "1.12.0"
# @keep
minSdk = "21"
okhttp = "4.12.0"
robolectric = "4.11.1"
rome = "1.18.0"
robolectric = "4.14.1"
rome = "2.1.0"
room = "2.6.1"
runtimeTracing = "1.0.0-beta01"
runtimeTracing = "1.7.5"
secrets = "2.0.1"
# @keep
targetSdk = "33"
version-catalog-update = "0.8.0"
version-catalog-update = "0.8.5"

[libraries]
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
Expand Down Expand Up @@ -102,7 +101,7 @@ androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core",
androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-ext-truth" }
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
androidx-test-runner = "androidx.test:runner:1.5.2"
androidx-test-runner = "androidx.test:runner:1.6.2"
androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androix-test-uiautomator" }
androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }
coil-kt-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
Expand Down Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion baseline-profiles/gradle/spotless.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
val ktlintVersion = "0.43.0"

initscript {
val spotlessVersion = "6.11.0"
val spotlessVersion = "6.25.0"

repositories {
mavenCentral()
Expand Down
Binary file modified baseline-profiles/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading