Skip to content

Upgrade compile SDK to 35 #311

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

Merged
keyboardsurfer merged 1 commit into from
Jan 29, 2025
Merged

Upgrade compile SDK to 35 #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions JankStatsSample/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@

plugins {
id("com.android.application")
id("kotlin-android")
alias(libs.plugins.kotlin)
alias(libs.plugins.compose.compiler)
}

android {
compileSdk = 33
compileSdk = 35

buildFeatures {
viewBinding = true
Expand All @@ -30,7 +31,7 @@ android {
defaultConfig {
applicationId = "com.example.jankstats"
minSdk = 21
targetSdk = 33
targetSdk = 35
versionCode = 1
versionName = "1.0"

Expand Down
2 changes: 2 additions & 0 deletions JankStatsSample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@
plugins {
alias(libs.plugins.application) apply false
alias(libs.plugins.kotlin) apply false
alias(libs.plugins.compose.compiler) apply false

}
14 changes: 7 additions & 7 deletions JankStatsSample/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@

[versions]

agp = "7.3.1"
appcompat = "1.7.0-alpha01"
compose = "1.2.1"
composeBom = "2022.11.00"
agp = "8.6.1"
appcompat = "1.7.0"
composeBom = "2025.01.00"
coroutines = "1.6.4"
constraint_layout = "2.1.4"
core = "1.9.0"
jankstats = "1.0.0-alpha03"
kotlin = "1.7.10"
jankstats = "1.0.0-beta01"
kotlin = "2.1.0"
material = "1.7.0"
navigation = "2.5.3"
tracing = "1.1.0"
Expand All @@ -48,5 +47,6 @@ tracing = { group = "androidx.tracing", name = "tracing-ktx", version.ref = "tra
[plugins]

application = { id = "com.android.application", version.ref = "agp" }
test = { id = "com.android.test", version.ref = "agp" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
test = { id = "com.android.test", version.ref = "agp" }
Binary file modified JankStatsSample/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
8 changes: 5 additions & 3 deletions JankStatsSample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#Tue Jan 11 09:20:06 PST 2022
#Mon Jan 27 17:38:23 CET 2025
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading