Upgrade compile SDK to 35

android · Jan 29, 2025 · 9372ca5 · 9372ca5
1 parent 0480a68
commit 9372ca5
Show file tree

Hide file tree

Showing 14 changed files with 296 additions and 224 deletions.
diff --git a/JankStatsSample/app/build.gradle.kts b/JankStatsSample/app/build.gradle.kts
@@ -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
@@ -30,7 +31,7 @@ android {
     defaultConfig {
         applicationId = "com.example.jankstats"
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 

diff --git a/JankStatsSample/build.gradle b/JankStatsSample/build.gradle
@@ -17,4 +17,6 @@
 plugins {
     alias(libs.plugins.application) apply false
     alias(libs.plugins.kotlin) apply false
+    alias(libs.plugins.compose.compiler) apply false
+
 }
diff --git a/JankStatsSample/gradle/libs.versions.toml b/JankStatsSample/gradle/libs.versions.toml
@@ -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"
@@ -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" }
diff --git a/JankStatsSample/gradle/wrapper/gradle-wrapper.jar b/JankStatsSample/gradle/wrapper/gradle-wrapper.jar
diff --git a/JankStatsSample/gradle/wrapper/gradle-wrapper.properties b/JankStatsSample/gradle/wrapper/gradle-wrapper.properties
@@ -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