From e98becb4db2c676c48886e9d34f042c9d75c691c Mon Sep 17 00:00:00 2001 From: Ben Weiss Date: Mon, 25 Sep 2023 16:46:23 +0100 Subject: [PATCH] Bump versions (#248) --- MicrobenchmarkSample/README.md | 2 +- MicrobenchmarkSample/app/build.gradle.kts | 10 +++++----- MicrobenchmarkSample/benchmarkable/build.gradle.kts | 11 ++++++++--- MicrobenchmarkSample/gradle/libs.versions.toml | 10 +++++----- .../gradle/wrapper/gradle-wrapper.properties | 6 +++--- MicrobenchmarkSample/microbenchmark/build.gradle.kts | 12 +++++++++--- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/MicrobenchmarkSample/README.md b/MicrobenchmarkSample/README.md index e9f37e7a..57f5a899 100644 --- a/MicrobenchmarkSample/README.md +++ b/MicrobenchmarkSample/README.md @@ -41,7 +41,7 @@ Open the project in Android Studio Arctic Fox 2020.3.1 or later, and run benchma Alternatively, run from command line with: ``` -./gradlew benchmark:cC +./gradlew benchmark:connectedCheck ``` ### Locking Clocks diff --git a/MicrobenchmarkSample/app/build.gradle.kts b/MicrobenchmarkSample/app/build.gradle.kts index 034459aa..70c0f203 100644 --- a/MicrobenchmarkSample/app/build.gradle.kts +++ b/MicrobenchmarkSample/app/build.gradle.kts @@ -5,12 +5,12 @@ plugins { android { namespace = "com.example.app" - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "com.example.app" minSdk = 21 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" @@ -24,11 +24,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_18 + targetCompatibility = JavaVersion.VERSION_18 } kotlinOptions { - jvmTarget = "11" + jvmTarget = JavaVersion.VERSION_18.toString() } } diff --git a/MicrobenchmarkSample/benchmarkable/build.gradle.kts b/MicrobenchmarkSample/benchmarkable/build.gradle.kts index 1bffbe21..e4b62006 100644 --- a/MicrobenchmarkSample/benchmarkable/build.gradle.kts +++ b/MicrobenchmarkSample/benchmarkable/build.gradle.kts @@ -4,16 +4,21 @@ plugins { } android { - compileSdk = 33 + compileSdk = 34 namespace = "com.example.benchmark.ui" defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_18 + targetCompatibility = JavaVersion.VERSION_18 } kotlinOptions { - jvmTarget = "11" + jvmTarget = JavaVersion.VERSION_18.toString() } } diff --git a/MicrobenchmarkSample/gradle/libs.versions.toml b/MicrobenchmarkSample/gradle/libs.versions.toml index 3aace1d0..63d35511 100644 --- a/MicrobenchmarkSample/gradle/libs.versions.toml +++ b/MicrobenchmarkSample/gradle/libs.versions.toml @@ -1,15 +1,16 @@ [versions] -agp = "7.3.1" +agp = "8.1.0" appcompat = "1.6.1" -benchmark = "1.2.0-beta01" +benchmark = "1.2.0-beta02" cardView = "1.0.0" constraintLayout = "2.1.4" core = "1.10.1" kotlin = "1.8.22" material = "1.9.0" -recyclerView = "1.3.0" +recyclerView = "1.3.1" androidxTest = "1.5.2" +androidxTestRules = "1.5.0" espressoCore = "3.5.1" jUnit = "4.13.2" testExt = "1.1.5" @@ -18,7 +19,6 @@ testExt = "1.1.5" appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } benchmark = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmark" } -benchmark-junit = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "benchmark" } cardview = { group = "androidx.cardview", name = "cardview", version.ref = "cardView" } constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" } core = { group = "androidx.core", name = "core-ktx", version.ref = "core" } @@ -28,7 +28,7 @@ kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", versio material = { group = "com.google.android.material", name = "material", version.ref = "material" } recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerView" } test-ext = { group = "androidx.test.ext", name = "junit", version.ref = "testExt" } -test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTest" } +test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" } test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTest" } [plugins] diff --git a/MicrobenchmarkSample/gradle/wrapper/gradle-wrapper.properties b/MicrobenchmarkSample/gradle/wrapper/gradle-wrapper.properties index c9473d0f..bc87085d 100644 --- a/MicrobenchmarkSample/gradle/wrapper/gradle-wrapper.properties +++ b/MicrobenchmarkSample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 16 10:31:31 BST 2022 +#Mon Jul 31 13:41:26 BST 2023 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.0-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/MicrobenchmarkSample/microbenchmark/build.gradle.kts b/MicrobenchmarkSample/microbenchmark/build.gradle.kts index 1d452e74..d0f3d5ca 100644 --- a/MicrobenchmarkSample/microbenchmark/build.gradle.kts +++ b/MicrobenchmarkSample/microbenchmark/build.gradle.kts @@ -6,11 +6,11 @@ plugins { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 - targetSdk = 33 + targetSdk = 34 // Set this argument to capture profiling information, instead of measuring performance. // Can be one of: @@ -33,9 +33,15 @@ android { } } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_18 + targetCompatibility = JavaVersion.VERSION_18 + } + kotlinOptions { - jvmTarget = "11" + jvmTarget = JavaVersion.VERSION_18.toString() } + namespace = "com.example.benchmark" }