Fix after merge

Author: mlykotom

MacrobenchmarkSample/app/build.gradle.kts

@@ -28,8 +28,8 @@ android {
         applicationId = "com.example.macrobenchmark.target"
         versionCode = 1
         versionName = "1.0"
+        minSdk = 21 // Minimum SDK for target application can be lower than for benchmarks.
         targetSdk = 34
-        minSdk = 21
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -68,11 +68,11 @@ android {
     // [END macrobenchmark_setup_app_build_type]
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-opt-in=kotlin.RequiresOptIn"
         )

MacrobenchmarkSample/baseBenchmarks/src/main/java/com/example/benchmark/macro/base/util/Utils.kt

@@ -19,7 +19,6 @@ package com.example.benchmark.macro.base.util
 import android.util.Log
 import androidx.test.uiautomator.BySelector
 import androidx.test.uiautomator.SearchCondition
-import androidx.test.uiautomator.Tracer
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.Until
@@ -36,7 +35,6 @@ fun UiDevice.findOrFail(
     selector: BySelector,
     message: String? = null,
 ): UiObject2 {
-    Tracer.trace(selector)
     val element = findObject(selector)
     if (element == null) {
         val hierarchy = getWindowHierarchy()
@@ -72,7 +70,6 @@ fun UiDevice.waitAndFind(
     timeout: Long = 5_000,
     message: String? = null,
 ): UiObject2 {
-    Tracer.trace(selector)
     waitOrFail(Until.hasObject(selector), timeout, message)
     return findOrFail(selector, message)
 }