Catch up to androidx.benchmark API changes

square · Apr 22, 2024 · 2b359b8 · 2b359b8
1 parent bc51102
commit 2b359b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/benchmarks/dungeon-benchmark/build.gradle.kts b/benchmarks/dungeon-benchmark/build.gradle.kts
@@ -25,7 +25,7 @@ android {
  }
 
  defaultConfig {
- minSdk = 23
+ minSdk = 28
  targetSdk = libsCatalog.version("targetSdk").toInt()
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/...hmark/src/main/java/com/squareup/sample/dungeon/benchmark/DungeonGatherBaselineProfile.kt b/...hmark/src/main/java/com/squareup/sample/dungeon/benchmark/DungeonGatherBaselineProfile.kt
@@ -1,7 +1,6 @@
 package com.squareup.sample.dungeon.benchmark
 
 import android.content.Context
-import androidx.benchmark.macro.ExperimentalBaselineProfilesApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -21,7 +20,6 @@ import org.junit.runner.RunWith
  * This test actually generates the profiles.
  */
 @RunWith(AndroidJUnit4::class)
-@OptIn(ExperimentalBaselineProfilesApi::class)
 class DungeonGatherBaselineProfile {
 
  @get:Rule val baselineProfileRule: BaselineProfileRule = BaselineProfileRule()
@@ -37,7 +35,7 @@ class DungeonGatherBaselineProfile {
 
  @Test
  fun baselineProfiles() {
- baselineProfileRule.collectBaselineProfile(
+ baselineProfileRule.collect(
  packageName = PACKAGE_NAME,
  ) {
  pressHome()
@@ -67,6 +65,6 @@ class DungeonGatherBaselineProfile {
  }
 
  const val PACKAGE_NAME: String = "com.squareup.sample.dungeon"
- const val UI_TIMEOUT_MS: Long = 2000L
+ private const val UI_TIMEOUT_MS: Long = 2000L
  }
 }
diff --git a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts
@@ -25,7 +25,7 @@ android {
  }
 
  defaultConfig {
- minSdk = 26
+ minSdk = 28
  targetSdk = libsCatalog.version("targetSdk").toInt()
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/...m/squareup/benchmarks/performance/complex/poetry/benchmark/ComplexPoetryGatherBaseline.kt b/...m/squareup/benchmarks/performance/complex/poetry/benchmark/ComplexPoetryGatherBaseline.kt
@@ -1,7 +1,6 @@
 package com.squareup.benchmarks.performance.complex.poetry.benchmark
 
 import android.content.Context
-import androidx.benchmark.macro.ExperimentalBaselineProfilesApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
@@ -19,7 +18,6 @@ import kotlin.time.ExperimentalTime
  *
  * You will need root access to a physical device to gather the baseline profile.
  */
-@ExperimentalBaselineProfilesApi
 class ComplexPoetryGatherBaseline {
  @get:Rule val baselineProfileRule: BaselineProfileRule = BaselineProfileRule()
 
@@ -33,8 +31,8 @@ class ComplexPoetryGatherBaseline {
  }
 
  @Test
- @OptIn(ExperimentalTime::class) fun baselineProfiles() {
- baselineProfileRule.collectBaselineProfile(
+ fun baselineProfiles() {
+ baselineProfileRule.collect(
  packageName = PACKAGE_NAME,
  ) {
  pressHome()