Skip to content

Commit e98becb

Browse files
Bump versions (#248)
1 parent fd02cb5 commit e98becb

File tree

6 files changed

+31
-20
lines changed

6 files changed

+31
-20
lines changed

MicrobenchmarkSample/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Open the project in Android Studio Arctic Fox 2020.3.1 or later, and run benchma
4141

4242
Alternatively, run from command line with:
4343
```
44-
./gradlew benchmark:cC
44+
./gradlew benchmark:connectedCheck
4545
```
4646

4747
### Locking Clocks

MicrobenchmarkSample/app/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55

66
android {
77
namespace = "com.example.app"
8-
compileSdk = 33
8+
compileSdk = 34
99

1010
defaultConfig {
1111
applicationId = "com.example.app"
1212
minSdk = 21
13-
targetSdk = 33
13+
targetSdk = 34
1414
versionCode = 1
1515
versionName = "1.0"
1616

@@ -24,11 +24,11 @@ android {
2424
}
2525
}
2626
compileOptions {
27-
sourceCompatibility = JavaVersion.VERSION_11
28-
targetCompatibility = JavaVersion.VERSION_11
27+
sourceCompatibility = JavaVersion.VERSION_18
28+
targetCompatibility = JavaVersion.VERSION_18
2929
}
3030
kotlinOptions {
31-
jvmTarget = "11"
31+
jvmTarget = JavaVersion.VERSION_18.toString()
3232
}
3333
}
3434

MicrobenchmarkSample/benchmarkable/build.gradle.kts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@ plugins {
44
}
55

66
android {
7-
compileSdk = 33
7+
compileSdk = 34
88
namespace = "com.example.benchmark.ui"
99

1010
defaultConfig {
1111
minSdk = 21
12-
targetSdk = 33
12+
targetSdk = 34
13+
}
14+
15+
compileOptions {
16+
sourceCompatibility = JavaVersion.VERSION_18
17+
targetCompatibility = JavaVersion.VERSION_18
1318
}
1419

1520
kotlinOptions {
16-
jvmTarget = "11"
21+
jvmTarget = JavaVersion.VERSION_18.toString()
1722
}
1823
}
1924

MicrobenchmarkSample/gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[versions]
2-
agp = "7.3.1"
2+
agp = "8.1.0"
33
appcompat = "1.6.1"
4-
benchmark = "1.2.0-beta01"
4+
benchmark = "1.2.0-beta02"
55
cardView = "1.0.0"
66
constraintLayout = "2.1.4"
77
core = "1.10.1"
88
kotlin = "1.8.22"
99
material = "1.9.0"
10-
recyclerView = "1.3.0"
10+
recyclerView = "1.3.1"
1111

1212
androidxTest = "1.5.2"
13+
androidxTestRules = "1.5.0"
1314
espressoCore = "3.5.1"
1415
jUnit = "4.13.2"
1516
testExt = "1.1.5"
@@ -18,7 +19,6 @@ testExt = "1.1.5"
1819

1920
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
2021
benchmark = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmark" }
21-
benchmark-junit = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "benchmark" }
2222
cardview = { group = "androidx.cardview", name = "cardview", version.ref = "cardView" }
2323
constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" }
2424
core = { group = "androidx.core", name = "core-ktx", version.ref = "core" }
@@ -28,7 +28,7 @@ kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", versio
2828
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
2929
recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerView" }
3030
test-ext = { group = "androidx.test.ext", name = "junit", version.ref = "testExt" }
31-
test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTest" }
31+
test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" }
3232
test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTest" }
3333

3434
[plugins]
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Sep 16 10:31:31 BST 2022
1+
#Mon Jul 31 13:41:26 BST 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

MicrobenchmarkSample/microbenchmark/build.gradle.kts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ plugins {
66
}
77

88
android {
9-
compileSdk = 33
9+
compileSdk = 34
1010

1111
defaultConfig {
1212
minSdk = 21
13-
targetSdk = 33
13+
targetSdk = 34
1414

1515
// Set this argument to capture profiling information, instead of measuring performance.
1616
// Can be one of:
@@ -33,9 +33,15 @@ android {
3333
}
3434
}
3535

36+
compileOptions {
37+
sourceCompatibility = JavaVersion.VERSION_18
38+
targetCompatibility = JavaVersion.VERSION_18
39+
}
40+
3641
kotlinOptions {
37-
jvmTarget = "11"
42+
jvmTarget = JavaVersion.VERSION_18.toString()
3843
}
44+
3945
namespace = "com.example.benchmark"
4046
}
4147

0 commit comments

Comments
 (0)