Skip to content

Commit

Permalink
Bump versions (#248)
Browse files Browse the repository at this point in the history
  • Loading branch information
keyboardsurfer authored Sep 25, 2023
1 parent fd02cb5 commit e98becb
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 20 deletions.
2 changes: 1 addition & 1 deletion MicrobenchmarkSample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions MicrobenchmarkSample/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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()
}
}

Expand Down
11 changes: 8 additions & 3 deletions MicrobenchmarkSample/benchmarkable/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}

Expand Down
10 changes: 5 additions & 5 deletions MicrobenchmarkSample/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand All @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions MicrobenchmarkSample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
12 changes: 9 additions & 3 deletions MicrobenchmarkSample/microbenchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
}

Expand Down

0 comments on commit e98becb

Please sign in to comment.