A fully functional Android app built entirely with Kotlin and Jetpack Compose
Configure baseline profiles in the baselineProfile lambda (#1060)
Ben Weiss7980c1d0dfde
diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txtindex 8a4bff7ab..55632ca61 100644--- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt+++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt@@ -68,7 +68,7 @@ androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0androidx.lifecycle:lifecycle-viewmodel:2.7.0androidx.loader:loader:1.0.0-androidx.metrics:metrics-performance:1.0.0-alpha04+androidx.metrics:metrics-performance:1.0.0-beta01androidx.profileinstaller:profileinstaller:1.3.1androidx.savedstate:savedstate-ktx:1.2.1androidx.savedstate:savedstate:1.2.1diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex afd37736f..6e2d9618b 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -52,9 +52,7 @@ android {// To publish on the Play store a private signing key is required, but to allow anyone// who clones the code to sign and run the release variant, use the debug signing key.// TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.- signingConfig = signingConfigs.named("debug").get()- // Ensure Baseline Profile is fresh for release builds.- baselineProfile.automaticGenerationDuringBuild = true+ signingConfig = signingConfigs.getByName("debug")}}@@ -71,6 +69,20 @@ android {namespace = "com.google.samples.apps.nowinandroid"}+baselineProfile {+ saveInSrc = false+ // Don't build on every iteration of a full assemble.+ // Instead enable generation directly for the release build variant.+ automaticGenerationDuringBuild = false+ mergeIntoMain = true+ variants {+ create("release") {+ // Ensure Baseline Profile is fresh for release builds.+ automaticGenerationDuringBuild = true+ }+ }+}+dependencies {implementation(projects.feature.interests)implementation(projects.feature.foryou)diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txtindex 7cd6df2d2..69e3cd651 100644--- a/app/dependencies/prodReleaseRuntimeClasspath.txt+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt@@ -102,7 +102,7 @@ androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0-alpha04androidx.lifecycle:lifecycle-viewmodel:2.8.0-alpha04androidx.loader:loader:1.0.0androidx.localbroadcastmanager:localbroadcastmanager:1.0.0-androidx.metrics:metrics-performance:1.0.0-alpha04+androidx.metrics:metrics-performance:1.0.0-beta01androidx.navigation:navigation-common-ktx:2.7.4androidx.navigation:navigation-common:2.7.4androidx.navigation:navigation-compose:2.7.4diff --git a/app/src/testDemo/screenshots/snackbar_expanded_expanded.png b/app/src/testDemo/screenshots/snackbar_expanded_expanded.pngindex e4c7520ab..ec075f3d9 100644Binary files a/app/src/testDemo/screenshots/snackbar_expanded_expanded.png and b/app/src/testDemo/screenshots/snackbar_expanded_expanded.png differdiff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.ktsindex 279c4b226..6ff797c2b 100644--- a/benchmarks/build.gradle.kts+++ b/benchmarks/build.gradle.kts@@ -13,6 +13,7 @@* See the License for the specific language governing permissions and* limitations under the License.*/+import com.android.build.api.dsl.ManagedVirtualDeviceimport com.google.samples.apps.nowinandroid.configureFlavorsplugins {@@ -46,7 +47,7 @@ android {}testOptions.managedDevices.devices {- create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6Api33") {+ create<ManagedVirtualDevice>("pixel6Api33") {device = "Pixel 6"apiLevel = 33systemImageSource = "aosp"diff --git a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/foryou/ForYouActions.ktindex 20b941a24..bca9ce117 100644--- a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt+++ b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt@@ -41,6 +41,11 @@ fun MacrobenchmarkScope.forYouWaitForContent() {*/fun MacrobenchmarkScope.forYouSelectTopics(recheckTopicsIfChecked: Boolean = false) {val topics = device.findObject(By.res("forYou:topicSelection"))+ val noChildren = topics.childCount == 0+ if (noChildren) {+ // TODO: Ensure ForYou has topics.+ fail("No topics found, can't scroll for baseline profile generation.")+ }// Set gesture margin from sides not to trigger system gesture navigationval horizontalMargin = 10 * topics.visibleBounds.width() / 100@@ -51,9 +56,6 @@ fun MacrobenchmarkScope.forYouSelectTopics(recheckTopicsIfChecked: Boolean = falvar visited = 0while (visited < 3) {- if (topics.childCount == 0) {- fail("No topics found, can't generate profile for ForYou page.")- }// Selecting some topics, which will populate items in the feed.val topic = topics.children[index % topics.childCount]// Find the checkable element to figure out whether it's checked or notdiff --git a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsActions.ktindex 05b276faa..82b707c2e 100644--- a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt+++ b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt@@ -21,6 +21,7 @@ import androidx.test.uiautomator.Byimport androidx.test.uiautomator.Untilimport com.google.samples.apps.nowinandroid.flingElementDownUpimport com.google.samples.apps.nowinandroid.waitForObjectOnTopAppBar+import org.junit.Assert.failfun MacrobenchmarkScope.goToInterestsScreen() {device.findObject(By.text("Interests")).click()@@ -35,7 +36,12 @@ fun MacrobenchmarkScope.goToInterestsScreen() {fun MacrobenchmarkScope.interestsScrollTopicsDownUp() {device.wait(Until.hasObject(By.res("interests:topics")), 5_000)val topicsList = device.findObject(By.res("interests:topics"))- device.flingElementDownUp(topicsList)+ if (topicsList != null) {+ // TODO: Ensure topics are availble.+ device.flingElementDownUp(topicsList)+ } else {+ fail("No topics found, can't scroll during baseline profile generation.")+ }}fun MacrobenchmarkScope.interestsWaitForTopics() {diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 7c354432c..6c1acdfe9 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -18,8 +18,8 @@ androidxDataStore = "1.0.0"androidxEspresso = "3.5.1"androidxHiltNavigationCompose = "1.2.0"androidxLifecycle = "2.7.0"-androidxMacroBenchmark = "1.2.2"-androidxMetrics = "1.0.0-alpha04"+androidxMacroBenchmark = "1.2.4"+androidxMetrics = "1.0.0-beta01"androidxNavigation = "2.7.4"androidxProfileinstaller = "1.3.1"androidxTestCore = "1.5.0"