Bump versions (#248)

keyboardsurfer · web-flow · commit e98becb4db2c · 2023-09-25T16:46:23.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@ plugins {`
`5`	`5`
`6`	`6`	`android {`
`7`	`7`	`namespace = "com.example.app"`
`8`		`- compileSdk = 33`
	`8`	`+ compileSdk = 34`
`9`	`9`
`10`	`10`	`defaultConfig {`
`11`	`11`	`applicationId = "com.example.app"`
`12`	`12`	`minSdk = 21`
`13`		`- targetSdk = 33`
	`13`	`+ targetSdk = 34`
`14`	`14`	`versionCode = 1`
`15`	`15`	`versionName = "1.0"`
`16`	`16`
`@@ -24,11 +24,11 @@ android {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`compileOptions {`
`27`		`- sourceCompatibility = JavaVersion.VERSION_11`
`28`		`- targetCompatibility = JavaVersion.VERSION_11`
	`27`	`+ sourceCompatibility = JavaVersion.VERSION_18`
	`28`	`+ targetCompatibility = JavaVersion.VERSION_18`
`29`	`29`	`}`
`30`	`30`	`kotlinOptions {`
`31`		`- jvmTarget = "11"`
	`31`	`+ jvmTarget = JavaVersion.VERSION_18.toString()`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,21 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
`7`		`- compileSdk = 33`
	`7`	`+ compileSdk = 34`
`8`	`8`	`namespace = "com.example.benchmark.ui"`
`9`	`9`
`10`	`10`	`defaultConfig {`
`11`	`11`	`minSdk = 21`
`12`		`- targetSdk = 33`
	`12`	`+ targetSdk = 34`
	`13`	`+ }`
	`14`	`+`
	`15`	`+ compileOptions {`
	`16`	`+ sourceCompatibility = JavaVersion.VERSION_18`
	`17`	`+ targetCompatibility = JavaVersion.VERSION_18`
`13`	`18`	`}`
`14`	`19`
`15`	`20`	`kotlinOptions {`
`16`		`- jvmTarget = "11"`
	`21`	`+ jvmTarget = JavaVersion.VERSION_18.toString()`
`17`	`22`	`}`
`18`	`23`	`}`
`19`	`24`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`android {`
`9`		`- compileSdk = 33`
	`9`	`+ compileSdk = 34`
`10`	`10`
`11`	`11`	`defaultConfig {`
`12`	`12`	`minSdk = 21`
`13`		`- targetSdk = 33`
	`13`	`+ targetSdk = 34`
`14`	`14`
`15`	`15`	`// Set this argument to capture profiling information, instead of measuring performance.`
`16`	`16`	`// Can be one of:`
`@@ -33,9 +33,15 @@ android {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ compileOptions {`
	`37`	`+ sourceCompatibility = JavaVersion.VERSION_18`
	`38`	`+ targetCompatibility = JavaVersion.VERSION_18`
	`39`	`+ }`
	`40`	`+`
`36`	`41`	`kotlinOptions {`
`37`		`- jvmTarget = "11"`
	`42`	`+ jvmTarget = JavaVersion.VERSION_18.toString()`
`38`	`43`	`}`
	`44`	`+`
`39`	`45`	`namespace = "com.example.benchmark"`
`40`	`46`	`}`
`41`	`47`