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.

Sign up for GitHub

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

Update androidx.activity to v1.10.0 + sdk 35 #1897

Merged
merged 8 commits into from
Feb 5, 2025
Merged

Update androidx.activity to v1.10.0 + sdk 35 #1897

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1d2cae
Update androidx.activity to v1.10.0
slack-oss-bot Feb 5, 2025
73cfbbd
Merge branch 'main' into renovate/androidx.activity
ZacSweers Feb 5, 2025
03c3ae4
Update to sdk 35
ZacSweers Feb 5, 2025
235dd70
Opportunistically update spotless too
ZacSweers Feb 5, 2025
ce5b065
Deprecations
ZacSweers Feb 5, 2025
a0f36c4
Deprecations
ZacSweers Feb 5, 2025
7d15f47
Update snapshots
ZacSweers Feb 5, 2025
8b90424
Spotless
ZacSweers Feb 5, 2025
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
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ subprojects {

// Common android config
val commonAndroidConfig: CommonExtension<*, *, *, *, *, *>.() -> Unit = {
compileSdk = 34
compileSdk = 35

if (hasCompose) {
buildFeatures { compose = true }
Expand All @@ -369,7 +369,7 @@ subprojects {
with(extensions.getByType<LibraryExtension>()) {
commonAndroidConfig()
defaultConfig { minSdk = 21 }
testOptions { targetSdk = 34 }
testOptions { targetSdk = 35 }
}

// Single-variant libraries
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
androidx-activity = "1.9.3"
androidx-activity = "1.10.0"
androidx-annotation = "1.9.1"
androidx-appcompat = "1.7.0"
androidx-browser = "1.8.0"
Expand Down Expand Up @@ -48,7 +48,7 @@ picnic = "0.7.0"
robolectric = "4.14.1"
roborazzi = "1.40.1"
skie = "0.10.1"
spotless = "7.0.0.BETA4"
spotless = "7.0.2"
sqldelight = "2.0.2"
telephoto = "0.14.0"
testParameterInjector = "1.18"
Expand Down
2 changes: 1 addition & 1 deletion samples/counter/apps/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {
namespace = "com.slack.circuit.sample.counter.android"
defaultConfig {
minSdk = 31 // For the dynamic m3 theme
targetSdk = 34
targetSdk = 35
}
}

Expand Down
2 changes: 1 addition & 1 deletion samples/interop/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
namespace = "com.slack.circuit.sample.interop"
defaultConfig {
minSdk = 28
targetSdk = 34
targetSdk = 35
versionCode = 1
versionName = "1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
2 changes: 1 addition & 1 deletion samples/star/apk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
namespace = "com.slack.circuit.sample.star.apk"
defaultConfig {
minSdk = 28
targetSdk = 34
targetSdk = 35
versionCode = 1
versionName = "1"
}
Expand Down
2 changes: 1 addition & 1 deletion samples/star/benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ val isCi = providers.environmentVariable("CI").isPresent
android {
namespace = "com.circuit.samples.star.benchmark"
defaultConfig {
targetSdk = 34
targetSdk = 35
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
2 changes: 1 addition & 1 deletion samples/tutorial/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android {
namespace = "com.slack.circuit.tutorial"
defaultConfig {
minSdk = 21
targetSdk = 34
targetSdk = 35
}
}

Expand Down
Loading