Upgrade versions, move src java -> kotlin

android · Aug 30, 2024 · 8ca6d63 · 8ca6d63
1 parent 570221d
commit 8ca6d63
Show file tree

Hide file tree

Showing 45 changed files with 18 additions and 21 deletions.
diff --git a/MacrobenchmarkSample/app/build.gradle.kts b/MacrobenchmarkSample/app/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     alias(libs.plugins.application)
+    alias(libs.plugins.compose)
     alias(libs.plugins.kotlin)
     alias(libs.plugins.baselineprofile)
 }
@@ -38,10 +39,6 @@ android {
         viewBinding = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
     // [START macrobenchmark_setup_app_build_type]
     buildTypes {
         getByName("release") {

diff --git a/...crobenchmark/target/ExampleApplication.kt → ...crobenchmark/target/ExampleApplication.kt b/...crobenchmark/target/ExampleApplication.kt → ...crobenchmark/target/ExampleApplication.kt
diff --git a/...get/activity/FullyDrawnStartupActivity.kt → ...get/activity/FullyDrawnStartupActivity.kt b/...get/activity/FullyDrawnStartupActivity.kt → ...get/activity/FullyDrawnStartupActivity.kt
diff --git a/...benchmark/target/activity/MainActivity.kt → ...benchmark/target/activity/MainActivity.kt b/...benchmark/target/activity/MainActivity.kt → ...benchmark/target/activity/MainActivity.kt
diff --git a/.../activity/clicklatency/ComposeActivity.kt → .../activity/clicklatency/ComposeActivity.kt b/.../activity/clicklatency/ComposeActivity.kt → .../activity/clicklatency/ComposeActivity.kt
diff --git a/...activity/clicklatency/ListViewActivity.kt → ...activity/clicklatency/ListViewActivity.kt b/...activity/clicklatency/ListViewActivity.kt → ...activity/clicklatency/ListViewActivity.kt
diff --git a/...ty/clicklatency/NestedRecyclerActivity.kt → ...ty/clicklatency/NestedRecyclerActivity.kt b/...ty/clicklatency/NestedRecyclerActivity.kt → ...ty/clicklatency/NestedRecyclerActivity.kt
diff --git a/...icklatency/NonExportedRecyclerActivity.kt → ...icklatency/NonExportedRecyclerActivity.kt b/...icklatency/NonExportedRecyclerActivity.kt → ...icklatency/NonExportedRecyclerActivity.kt
diff --git a/...vity/clicklatency/RecyclerViewActivity.kt → ...vity/clicklatency/RecyclerViewActivity.kt b/...vity/clicklatency/RecyclerViewActivity.kt → ...vity/clicklatency/RecyclerViewActivity.kt
diff --git a/...tivity/clicklatency/ScrollViewActivity.kt → ...tivity/clicklatency/ScrollViewActivity.kt b/...tivity/clicklatency/ScrollViewActivity.kt → ...tivity/clicklatency/ScrollViewActivity.kt
diff --git a/...rk/target/activity/login/LoginActivity.kt → ...rk/target/activity/login/LoginActivity.kt b/...rk/target/activity/login/LoginActivity.kt → ...rk/target/activity/login/LoginActivity.kt
diff --git a/.../target/recyclerview/BindingViewHolder.kt → .../target/recyclerview/BindingViewHolder.kt b/.../target/recyclerview/BindingViewHolder.kt → .../target/recyclerview/BindingViewHolder.kt
diff --git a/...hmark/target/recyclerview/ChildAdapter.kt → ...hmark/target/recyclerview/ChildAdapter.kt b/...hmark/target/recyclerview/ChildAdapter.kt → ...hmark/target/recyclerview/ChildAdapter.kt
diff --git a/...enchmark/target/recyclerview/ChildItem.kt → ...enchmark/target/recyclerview/ChildItem.kt b/...enchmark/target/recyclerview/ChildItem.kt → ...enchmark/target/recyclerview/ChildItem.kt
diff --git a/...crobenchmark/target/recyclerview/Entry.kt → ...crobenchmark/target/recyclerview/Entry.kt b/...crobenchmark/target/recyclerview/Entry.kt → ...crobenchmark/target/recyclerview/Entry.kt
diff --git a/...t/recyclerview/NestedRecyclerViewModel.kt → ...t/recyclerview/NestedRecyclerViewModel.kt b/...t/recyclerview/NestedRecyclerViewModel.kt → ...t/recyclerview/NestedRecyclerViewModel.kt
diff --git a/...mark/target/recyclerview/ParentAdapter.kt → ...mark/target/recyclerview/ParentAdapter.kt b/...mark/target/recyclerview/ParentAdapter.kt → ...mark/target/recyclerview/ParentAdapter.kt
diff --git a/...nchmark/target/recyclerview/ParentItem.kt → ...nchmark/target/recyclerview/ParentItem.kt b/...nchmark/target/recyclerview/ParentItem.kt → ...nchmark/target/recyclerview/ParentItem.kt
diff --git a/...le/macrobenchmark/target/util/AppLogin.kt → ...le/macrobenchmark/target/util/AppLogin.kt b/...le/macrobenchmark/target/util/AppLogin.kt → ...le/macrobenchmark/target/util/AppLogin.kt
diff --git a/.../macrobenchmark/target/util/ClickTrace.kt → .../macrobenchmark/target/util/ClickTrace.kt b/.../macrobenchmark/target/util/ClickTrace.kt → .../macrobenchmark/target/util/ClickTrace.kt
diff --git a/...xample/macrobenchmark/target/util/Data.kt → ...xample/macrobenchmark/target/util/Data.kt b/...xample/macrobenchmark/target/util/Data.kt → ...xample/macrobenchmark/target/util/Data.kt
diff --git a/...obenchmark/target/util/SampleViewModel.kt → ...obenchmark/target/util/SampleViewModel.kt b/...obenchmark/target/util/SampleViewModel.kt → ...obenchmark/target/util/SampleViewModel.kt
diff --git a/...ample/macrobenchmark/target/util/Utils.kt → ...ample/macrobenchmark/target/util/Utils.kt b/...ample/macrobenchmark/target/util/Utils.kt → ...ample/macrobenchmark/target/util/Utils.kt
diff --git a/MacrobenchmarkSample/gradle/libs.versions.toml b/MacrobenchmarkSample/gradle/libs.versions.toml
@@ -1,21 +1,20 @@
 [versions]
-agp = "8.3.0"
-activity = "1.8.2"
-appcompat = "1.6.1"
-benchmark = "1.2.3"
-composeBom = "2024.02.01"
-composeCompiler = "1.5.4"
+agp = "8.5.2"
+activity = "1.9.1"
+appcompat = "1.7.0"
+benchmark = "1.3.0"
+composeBom = "2024.08.00"
 constraintLayout = "2.1.4"
-core = "1.12.0"
-coroutines = "1.7.3"
-concurrentFutures = "1.1.0"
+core = "1.13.1"
+coroutines = "1.8.0"
+concurrentFutures = "1.2.0"
 curtains = "1.2.4"
-dataStore = "1.0.0"
-espressoCore = "3.5.1"
-jUnit = "1.1.5"
-kotlin = "1.9.20"
-lifecycle = "2.7.0"
-material = "1.11.0"
+dataStore = "1.1.1"
+espressoCore = "3.6.1"
+jUnit = "1.2.1"
+kotlin = "2.0.10"
+lifecycle = "2.8.4"
+material = "1.12.0"
 profileInstaller = "1.3.1"
 runtimeTracing = "1.0.0-beta01"
 tracing = "1.3.0-alpha02"
@@ -54,6 +53,7 @@ viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", ve
 
 application = { id = "com.android.application", version.ref = "agp" }
 baselineprofile = { id = "androidx.baselineprofile", version.ref = "benchmark" }
+compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 library = { id = "com.android.library", version.ref = "agp" }
 test = { id = "com.android.test", version.ref = "agp" }
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/MacrobenchmarkSample/gradle/wrapper/gradle-wrapper.properties b/MacrobenchmarkSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 06 15:40:15 GMT 2023
+#Fri Aug 30 09:45:14 CEST 2024
 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.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...ofile/BaselineProfileGeneratorScaffold.kt → ...ofile/BaselineProfileGeneratorScaffold.kt b/...ofile/BaselineProfileGeneratorScaffold.kt → ...ofile/BaselineProfileGeneratorScaffold.kt
diff --git a/.../macrobenchmark/baselineprofile/Common.kt → .../macrobenchmark/baselineprofile/Common.kt b/.../macrobenchmark/baselineprofile/Common.kt → .../macrobenchmark/baselineprofile/Common.kt
diff --git a/...omposeActivityBaselineProfileGenerator.kt → ...omposeActivityBaselineProfileGenerator.kt b/...omposeActivityBaselineProfileGenerator.kt → ...omposeActivityBaselineProfileGenerator.kt
diff --git a/...eprofile/LoginBaselineProfileGenerator.kt → ...eprofile/LoginBaselineProfileGenerator.kt b/...eprofile/LoginBaselineProfileGenerator.kt → ...eprofile/LoginBaselineProfileGenerator.kt
diff --git a/...erViewActivityBaselineProfileGenerator.kt → ...erViewActivityBaselineProfileGenerator.kt b/...erViewActivityBaselineProfileGenerator.kt → ...erViewActivityBaselineProfileGenerator.kt
diff --git a/...le/StartupOnlyBaselineProfileGenerator.kt → ...le/StartupOnlyBaselineProfileGenerator.kt b/...le/StartupOnlyBaselineProfileGenerator.kt → ...le/StartupOnlyBaselineProfileGenerator.kt
diff --git a/...aselineprofile/StartupProfileGenerator.kt → ...aselineprofile/StartupProfileGenerator.kt b/...aselineprofile/StartupProfileGenerator.kt → ...aselineprofile/StartupProfileGenerator.kt
diff --git a/...acrobenchmark/benchmark/LoginBenchmark.kt → ...acrobenchmark/benchmark/LoginBenchmark.kt b/...acrobenchmark/benchmark/LoginBenchmark.kt → ...acrobenchmark/benchmark/LoginBenchmark.kt
diff --git a/...rk/clickslatency/ClickLatencyBenchmark.kt → ...rk/clickslatency/ClickLatencyBenchmark.kt b/...rk/clickslatency/ClickLatencyBenchmark.kt → ...rk/clickslatency/ClickLatencyBenchmark.kt
diff --git a/.../benchmark/frames/FrameTimingBenchmark.kt → .../benchmark/frames/FrameTimingBenchmark.kt b/.../benchmark/frames/FrameTimingBenchmark.kt → .../benchmark/frames/FrameTimingBenchmark.kt
diff --git a/...es/NestedRecyclerFrameTimingBenchmarks.kt → ...es/NestedRecyclerFrameTimingBenchmarks.kt b/...es/NestedRecyclerFrameTimingBenchmarks.kt → ...es/NestedRecyclerFrameTimingBenchmarks.kt
diff --git a/...rk/frames/NonExportedActivityBenchmark.kt → ...rk/frames/NonExportedActivityBenchmark.kt b/...rk/frames/NonExportedActivityBenchmark.kt → ...rk/frames/NonExportedActivityBenchmark.kt
diff --git a/...k/frames/TextInputFrameTimingBenchmark.kt → ...k/frames/TextInputFrameTimingBenchmark.kt b/...k/frames/TextInputFrameTimingBenchmark.kt → ...k/frames/TextInputFrameTimingBenchmark.kt
diff --git a/...mark/benchmark/permissions/Permissions.kt → ...mark/benchmark/permissions/Permissions.kt b/...mark/benchmark/permissions/Permissions.kt → ...mark/benchmark/permissions/Permissions.kt
diff --git a/...hmark/benchmark/scroll/ScrollBenchmark.kt → ...hmark/benchmark/scroll/ScrollBenchmark.kt b/...hmark/benchmark/scroll/ScrollBenchmark.kt → ...hmark/benchmark/scroll/ScrollBenchmark.kt
diff --git a/...ark/startup/FullyDrawnStartupBenchmark.kt → ...ark/startup/FullyDrawnStartupBenchmark.kt b/...ark/startup/FullyDrawnStartupBenchmark.kt → ...ark/startup/FullyDrawnStartupBenchmark.kt
diff --git a/...nchmark/startup/SampleStartupBenchmark.kt → ...nchmark/startup/SampleStartupBenchmark.kt b/...nchmark/startup/SampleStartupBenchmark.kt → ...nchmark/startup/SampleStartupBenchmark.kt
diff --git a/...mark/startup/SmallListStartupBenchmark.kt → ...mark/startup/SmallListStartupBenchmark.kt b/...mark/startup/SmallListStartupBenchmark.kt → ...mark/startup/SmallListStartupBenchmark.kt
diff --git a/...ark/benchmark/startup/StartupBenchmark.kt → ...ark/benchmark/startup/StartupBenchmark.kt b/...ark/benchmark/startup/StartupBenchmark.kt → ...ark/benchmark/startup/StartupBenchmark.kt
diff --git a/...le/macrobenchmark/benchmark/util/Utils.kt → ...le/macrobenchmark/benchmark/util/Utils.kt b/...le/macrobenchmark/benchmark/util/Utils.kt → ...le/macrobenchmark/benchmark/util/Utils.kt