A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove legacy benchmark build type (#1207)
Ben Weissf64f1c0aa2b8
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yamlindex fa3a77f55..f8595f221 100644--- a/.github/workflows/Build.yaml+++ b/.github/workflows/Build.yaml@@ -109,13 +109,9 @@ jobs:- name: Build all build type and flavor permutationsrun: ./gradlew :app:assemble :benchmarks:assemble-x pixel6Api33ProdNonMinifiedReleaseAndroidTest- -x pixel6Api33ProdNonMinifiedBenchmarkAndroidTest-x pixel6Api33DemoNonMinifiedReleaseAndroidTest- -x pixel6Api33DemoNonMinifiedBenchmarkAndroidTest-x collectDemoNonMinifiedReleaseBaselineProfile- -x collectDemoNonMinifiedBenchmarkBaselineProfile-x collectProdNonMinifiedReleaseBaselineProfile- -x collectProdNonMinifiedBenchmarkBaselineProfile- name: Upload build outputs (APKs)uses: actions/upload-artifact@v4diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txtindex 10f2dfa32..c3f83d734 100644--- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt+++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt@@ -70,7 +70,8 @@ androidx.profileinstaller:profileinstaller:1.3.1androidx.savedstate:savedstate-ktx:1.2.1androidx.savedstate:savedstate:1.2.1androidx.startup:startup-runtime:1.1.1-androidx.tracing:tracing:1.0.0+androidx.tracing:tracing-ktx:1.3.0-alpha02+androidx.tracing:tracing:1.3.0-alpha02androidx.vectordrawable:vectordrawable-animated:1.1.0androidx.vectordrawable:vectordrawable:1.1.0androidx.versionedparcelable:versionedparcelable:1.1.1diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 38166f7ff..520baa134 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -57,17 +57,6 @@ android {// Ensure Baseline Profile is fresh for release builds.baselineProfile.automaticGenerationDuringBuild = true}- create("benchmark") {- // Enable all the optimizations from release build through initWith(release).- initWith(release)- matchingFallbacks.add("release")- // Debug key signing is available to everyone.- signingConfig = signingConfigs.getByName("debug")- // Only use benchmark proguard rules- proguardFiles("benchmark-rules.pro")- isMinifyEnabled = true- applicationIdSuffix = NiaBuildType.BENCHMARK.applicationIdSuffix- }}packaging {diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txtindex e9e3ebf8e..e19a37db9 100644--- a/app/dependencies/prodReleaseRuntimeClasspath.txt+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt@@ -105,8 +105,8 @@ androidx.savedstate:savedstate:1.2.1androidx.sqlite:sqlite-framework:2.4.0androidx.sqlite:sqlite:2.4.0androidx.startup:startup-runtime:1.1.1-androidx.tracing:tracing-ktx:1.1.0-androidx.tracing:tracing:1.1.0+androidx.tracing:tracing-ktx:1.3.0-alpha02+androidx.tracing:tracing:1.3.0-alpha02androidx.vectordrawable:vectordrawable-animated:1.1.0androidx.vectordrawable:vectordrawable:1.1.0androidx.versionedparcelable:versionedparcelable:1.1.1diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.ktsindex 67fccb979..279c4b226 100644--- a/benchmarks/build.gradle.kts+++ b/benchmarks/build.gradle.kts@@ -13,7 +13,6 @@* See the License for the specific language governing permissions and* limitations under the License.*/-import com.google.samples.apps.nowinandroid.NiaBuildTypeimport com.google.samples.apps.nowinandroid.configureFlavorsplugins {@@ -35,23 +34,6 @@ android {buildConfig = true}- buildTypes {- // This benchmark buildType is used for benchmarking, and should function like your- // release build (for example, with minification on). It's signed with a debug key- // for easy local/CI testing.- create("benchmark") {- // Keep the build type debuggable so we can attach a debugger if needed.- isDebuggable = true- signingConfig = signingConfigs.getByName("debug")- matchingFallbacks.add("release")- buildConfigField(- "String",- "APP_BUILD_TYPE_SUFFIX",- "\"${NiaBuildType.BENCHMARK.applicationIdSuffix ?: ""}\""- )- }- }-// Use the same flavor dimensions as the application to allow generating Baseline Profiles on prod,// which is more close to what will be shipped to users (no fake data), but has ability to run the// benchmarks on demo, so we benchmark on stable data.diff --git a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/Utils.kt b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/Utils.ktindex 9ece991c4..e8fb53c4f 100644--- a/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/Utils.kt+++ b/benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/Utils.kt@@ -30,7 +30,6 @@ import java.io.ByteArrayOutputStreamval PACKAGE_NAME = buildString {append("com.google.samples.apps.nowinandroid")append(BuildConfig.APP_FLAVOR_SUFFIX)- append(BuildConfig.APP_BUILD_TYPE_SUFFIX)}fun UiDevice.flingElementDownUp(element: UiObject2) {diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.ktindex 653506f51..e4f40840d 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.kt@@ -22,5 +22,4 @@ package com.google.samples.apps.nowinandroidenum class NiaBuildType(val applicationIdSuffix: String? = null) {DEBUG(".debug"),RELEASE,- BENCHMARK(".benchmark")}diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex e8b19594f..e1418d747 100644--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@ -81,9 +81,9 @@ import androidx.compose.ui.tooling.preview.PreviewParameterimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.maximport androidx.compose.ui.unit.sp-import androidx.tracing.traceimport androidx.hilt.navigation.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycle+import androidx.tracing.traceimport com.google.accompanist.permissions.ExperimentalPermissionsApiimport com.google.accompanist.permissions.PermissionStatus.Deniedimport com.google.accompanist.permissions.rememberPermissionState