Skip to content

Commit 316857c

Browse files
committed
Updates: java compatible version
1 parent ca88143 commit 316857c

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

baseline-profiles/baselineprofile/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ android {
1111
namespace = "com.google.baselineprofile"
1212
compileSdk = 34
1313

14+
15+
1416
compileOptions {
15-
sourceCompatibility = JavaVersion.VERSION_17
16-
targetCompatibility = JavaVersion.VERSION_17
17+
sourceCompatibility = JavaVersion.VERSION_11
18+
targetCompatibility = JavaVersion.VERSION_11
1719
}
1820

1921
kotlinOptions {
20-
jvmTarget = JavaVersion.VERSION_17.toString()
22+
jvmTarget = JavaVersion.VERSION_11.toString()
2123
}
2224

2325
defaultConfig {

benchmarking/gradle/libs.versions.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx
4141
androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" }
4242
androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle-compose" }
4343
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
44-
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
45-
androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
46-
androidx-palette = { module = "androidx.palette:palette", version.ref = "androidx-palette" }
47-
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
48-
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
49-
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
5044
androidx-runtime-tracing = { module = "androidx.compose.runtime:runtime-tracing", version.ref = "runtimeTracing" }
5145
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
5246
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }

benchmarking/macrobenchmark/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@ android {
88
namespace = "com.example.macrobenchmark"
99

1010
compileOptions {
11-
sourceCompatibility = JavaVersion.VERSION_17
12-
targetCompatibility = JavaVersion.VERSION_17
11+
sourceCompatibility = JavaVersion.VERSION_11
12+
targetCompatibility = JavaVersion.VERSION_11
1313
}
1414

1515
kotlinOptions {
16-
jvmTarget = JavaVersion.VERSION_17.toString()
16+
jvmTarget = JavaVersion.VERSION_11.toString()
1717
}
1818

1919
defaultConfig {
2020
minSdk = 23
2121
targetSdk = 35
2222

2323
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
24+
testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] = "EMULATOR"
2425
}
2526

2627
buildTypes {

0 commit comments

Comments
 (0)