Skip to content

Commit 28c0487

Browse files
Upgrade compileSdk to 35, dependency version upgrades
Change-Id: Ib4a1f9bef1dd3e1736907479125d0abb5b22e9bd
1 parent b218359 commit 28c0487

File tree

8 files changed

+26
-21
lines changed

8 files changed

+26
-21
lines changed

app/prodRelease-badging.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
1+
package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
22
sdkVersion:'21'
3-
targetSdkVersion:'34'
3+
targetSdkVersion:'35'
44
uses-permission: name='android.permission.INTERNET'
55
uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
66
uses-permission: name='android.permission.POST_NOTIFICATIONS'

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
<activity
4343
android:name=".MainActivity"
44+
android:windowSoftInputMode="adjustResize"
4445
android:exported="true">
4546
<intent-filter>
4647
<action android:name="android.intent.action.MAIN" />

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
3838

3939
extensions.configure<ApplicationExtension> {
4040
configureKotlinAndroid(this)
41-
defaultConfig.targetSdk = 34
41+
defaultConfig.targetSdk = 35
4242
@Suppress("UnstableApiUsage")
4343
testOptions.animationsDisabled = true
4444
configureGradleManagedDevices(this)

build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import org.gradle.api.Plugin
2121
import org.gradle.api.Project
2222
import org.gradle.kotlin.dsl.configure
2323
import org.gradle.kotlin.dsl.dependencies
24+
import org.gradle.kotlin.dsl.exclude
2425

2526
class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
2627
override fun apply(target: Project) {
@@ -35,7 +36,10 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
3536
val bom = libs.findLibrary("firebase-bom").get()
3637
add("implementation", platform(bom))
3738
"implementation"(libs.findLibrary("firebase.analytics").get())
38-
"implementation"(libs.findLibrary("firebase.performance").get())
39+
"implementation"(libs.findLibrary("firebase.performance").get()) {
40+
exclude(group = "com.google.protobuf", module = "protobuf-javalite")
41+
exclude(group = "com.google.firebase", module = "protolite-well-known-types")
42+
}
3943
"implementation"(libs.findLibrary("firebase.crashlytics").get())
4044
}
4145

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
3939

4040
extensions.configure<LibraryExtension> {
4141
configureKotlinAndroid(this)
42-
defaultConfig.targetSdk = 34
42+
defaultConfig.targetSdk = 35
4343
defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4444
testOptions.animationsDisabled = true
4545
configureFlavors(this)

build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class AndroidTestConventionPlugin : Plugin<Project> {
3131

3232
extensions.configure<TestExtension> {
3333
configureKotlinAndroid(this)
34-
defaultConfig.targetSdk = 34
34+
defaultConfig.targetSdk = 35
3535
configureGradleManagedDevices(this)
3636
}
3737
}

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ internal fun Project.configureKotlinAndroid(
3636
commonExtension: CommonExtension<*, *, *, *, *, *>,
3737
) {
3838
commonExtension.apply {
39-
compileSdk = 34
39+
compileSdk = 35
4040

4141
defaultConfig {
4242
minSdk = 21

gradle/libs.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
[versions]
22
accompanist = "0.36.0"
3-
androidDesugarJdkLibs = "2.0.4"
3+
androidDesugarJdkLibs = "2.1.3"
44
# AGP and tools should be updated together
55
androidGradlePlugin = "8.6.1"
6-
androidTools = "31.7.2"
6+
androidTools = "31.7.3"
77
androidxActivity = "1.9.3"
88
androidxAppCompat = "1.7.0"
99
androidxBrowser = "1.8.0"
1010
androidxComposeBom = "2024.11.00"
1111
androidxComposeRuntimeTracing = "1.7.5"
12-
androidxCore = "1.13.1"
12+
androidxCore = "1.15.0"
1313
androidxCoreSplashscreen = "1.0.1"
1414
androidxDataStore = "1.1.1"
1515
androidxEspresso = "3.6.1"
1616
androidxHiltNavigationCompose = "1.2.0"
17-
androidxLifecycle = "2.8.6"
18-
androidxMacroBenchmark = "1.3.1"
17+
androidxLifecycle = "2.8.7"
18+
androidxMacroBenchmark = "1.3.3"
1919
androidxMetrics = "1.0.0-beta01"
20-
androidxNavigation = "2.8.0"
21-
androidxProfileinstaller = "1.3.1"
20+
androidxNavigation = "2.8.4"
21+
androidxProfileinstaller = "1.4.1"
2222
androidxTestCore = "1.6.1"
2323
androidxTestExt = "1.2.1"
2424
androidxTestRules = "1.6.1"
2525
androidxTestRunner = "1.6.2"
2626
androidxTracing = "1.3.0-alpha02"
2727
androidxUiAutomator = "2.3.0"
2828
androidxWindowManager = "1.3.0"
29-
androidxWork = "2.9.0"
29+
androidxWork = "2.10.0"
3030
coil = "2.7.0"
3131
dependencyGuard = "0.5.0"
32-
firebaseBom = "33.3.0"
33-
firebaseCrashlyticsPlugin = "2.9.9"
32+
firebaseBom = "33.7.0"
33+
firebaseCrashlyticsPlugin = "3.0.2"
3434
firebasePerfPlugin = "1.4.2"
35-
gmsPlugin = "4.4.1"
35+
gmsPlugin = "4.4.2"
3636
googleOss = "17.1.0"
3737
googleOssPlugin = "0.10.6"
3838
hilt = "2.52"
@@ -46,12 +46,12 @@ kotlinxSerializationJson = "1.6.3"
4646
ksp = "2.0.20-1.0.25"
4747
moduleGraph = "2.7.1"
4848
okhttp = "4.12.0"
49-
protobuf = "4.26.1"
49+
protobuf = "4.28.2"
5050
protobufPlugin = "0.9.4"
5151
retrofit = "2.11.0"
5252
retrofitKotlinxSerializationJson = "1.0.0"
53-
robolectric = "4.11.1"
54-
roborazzi = "1.7.0"
53+
robolectric = "4.14.1"
54+
roborazzi = "1.36.0"
5555
room = "2.6.1"
5656
secrets = "2.0.1"
5757
truth = "1.4.4"

0 commit comments

Comments
 (0)