Merge branch 'main' into bot/update-baseline-profiles

# Conflicts:
#	MacrobenchmarkSample/app/build.gradle.kts
#	MacrobenchmarkSample/baselineProfile/build.gradle.kts
#	MacrobenchmarkSample/baselineProfile/src/main/java/com/example/macrobenchmark/baselineprofile/BaselineProfileGeneratorScaffold.kt
#	MacrobenchmarkSample/baselineProfile/src/main/java/com/example/macrobenchmark/baselineprofile/RecyclerViewActivityBaselineProfileGenerator.kt
#	MacrobenchmarkSample/gradle/libs.versions.toml
#	MacrobenchmarkSample/macrobenchmark/build.gradle.kts

Author: mlykotom

MacrobenchmarkSample/app/build.gradle.kts

@@ -21,15 +21,15 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     namespace = "com.example.macrobenchmark.target"
 
     defaultConfig {
         applicationId = "com.example.macrobenchmark.target"
         versionCode = 1
         versionName = "1.0"
+        targetSdk = 34
         minSdk = 21
-        targetSdk = 33
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

MacrobenchmarkSample/app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
     <application
         android:name=".ExampleApplication"
         android:allowBackup="false"

MacrobenchmarkSample/app/src/main/java/com/example/macrobenchmark/target/activity/FullyDrawnStartupActivity.kt

@@ -18,11 +18,17 @@ package com.example.macrobenchmark.target.activity
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import androidx.activity.compose.ReportDrawnAfter
+import androidx.activity.compose.ReportDrawnWhen
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import com.example.macrobenchmark.target.util.SampleViewModel
 
 class FullyDrawnStartupActivity : ComponentActivity() {
@@ -32,15 +38,21 @@ class FullyDrawnStartupActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            TextBlock("Compose Macrobenchmark Target")
-            ReportDrawnAfter {
-                sampleViewModel.data.isReady()
+            var isLoaded by remember { mutableStateOf(false) }
+            ReportDrawnWhen { isLoaded }
+
+            LaunchedEffect(Unit) {
+                isLoaded = sampleViewModel.data.isReady()
             }
-        }
-    }
 
-    @Composable
-    fun TextBlock(text: String) {
-        Text(text)
+            Column {
+                Text("Compose Macrobenchmark Target")
+                if (!isLoaded) {
+                    CircularProgressIndicator()
+                } else {
+                    Text("Fully Drawn")
+                }
+            }
+        }
     }
-}
+}

MacrobenchmarkSample/app/src/main/java/com/example/macrobenchmark/target/util/Data.kt

@@ -16,18 +16,17 @@
 
 package com.example.macrobenchmark.target.util
 
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.Random
 
 /** Pretending to load data from a remote source */
 class SampleData {
     private val random = Random()
     suspend fun isReady(): Boolean {
-        CoroutineScope(Dispatchers.Default).launch {
-            delay(random.nextInt(500).toLong())
+        withContext(Dispatchers.Default) {
+            delay(1000 + random.nextInt(1000).toLong())
         }
         return true
     }

MacrobenchmarkSample/baseBenchmarks/build.gradle.kts

@@ -21,7 +21,7 @@ plugins {
 
 android {
     namespace = "com.example.benchmark.macro.base"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 23

MacrobenchmarkSample/baselineProfile/build.gradle.kts

@@ -23,7 +23,7 @@ plugins {
 
 android {
     namespace = "com.example.benchmark.baselinprofile"
-    compileSdk = 33
+    compileSdk = 34
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -38,7 +38,7 @@ android {
         // Minimum supported version for Baseline Profiles.
         // On lower APIs, apps are fully AOT compile, therefore Baseline Profiles aren't needed.
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

MacrobenchmarkSample/baselineProfile/src/main/java/com/example/macrobenchmark/baselineprofile/BaselineProfileGeneratorScaffold.kt

@@ -16,12 +16,11 @@
 
 package com.example.macrobenchmark.baselineprofile
 
-import androidx.benchmark.macro.ExperimentalStableBaselineProfilesApi
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.uiautomator.Tracer
-import org.junit.BeforeClass
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -31,29 +30,20 @@ import org.junit.runner.RunWith
  * start generating a profile directly by implementing [MacrobenchmarkScope.profileBlock].
  */
 @RunWith(AndroidJUnit4::class)
+@RequiresApi(Build.VERSION_CODES.P)
 abstract class BaselineProfileGeneratorScaffold {
 
     @get:Rule
     val rule = BaselineProfileRule()
-
-
-    companion object {
-        @BeforeClass
-        @JvmStatic
-        fun beforeClass() {
-            Tracer.getInstance().setOutputMode(Tracer.Mode.LOGCAT)
-        }
-    }
-
+    
     /**
      * Generate a baseline profile in this function.
      */
     abstract fun MacrobenchmarkScope.profileBlock()
 
-    @OptIn(ExperimentalStableBaselineProfilesApi::class)
     @Test
     fun profileGenerator() {
-        rule.collectStableBaselineProfile(
+        rule.collect(
             packageName = TARGET_PACKAGE,
             maxIterations = 10
         ) {