refactor: baseline profiles

Author: f-arslan

app/build.gradle.kts

@@ -22,7 +22,6 @@ android {
         }
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
     }
 
     val keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -40,7 +39,12 @@ android {
 
 
     buildTypes {
-        release {
+        getByName("debug") {
+            signingConfig = signingConfigs.getByName("config")
+        }
+
+
+        getByName("release") {
             isMinifyEnabled = true
             isShrinkResources = true
             proguardFiles(

app/src/main/AndroidManifest.xml

@@ -9,6 +9,11 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
+
     <application
         android:name=".GmHiltApp"
         android:allowBackup="true"

benchmarks/build.gradle.kts

@@ -1,20 +1,36 @@
 import com.android.build.api.dsl.ManagedVirtualDevice
 
 plugins {
+    alias(libs.plugins.android.test)
+    alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.baselineprofile)
-    alias(libs.plugins.gptmap.android.test)
 }
 
 android {
     namespace = "com.espressodev.benchmarks"
+    compileSdk = 34
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 
     defaultConfig {
         minSdk = 28
+        targetSdk = 34
+
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     targetProjectPath = ":app"
 
+    // This code creates the gradle managed device used to generate baseline profiles.
+    // To use GMD please invoke generation through the command line:
+    // ./gradlew :app:generateBaselineProfile
     testOptions.managedDevices.devices {
         create<ManagedVirtualDevice>("pixel6Api34") {
             device = "Pixel 6"
@@ -32,8 +48,8 @@ baselineProfile {
 }
 
 dependencies {
-    implementation(libs.androidx.test.ext)
-    implementation(libs.androidx.espresso.core)
-    implementation(libs.androidx.uiautomator)
-    implementation(libs.androidx.benchmark.macro.junit4)
-}
+    implementation(libs.androidx.junit)
+    implementation(libs.androidx.test.espresso.core)
+    implementation(libs.androidx.test.uiautomator)
+    implementation(libs.androidx.benchmark.macro)
+}

benchmarks/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest />
+<manifest />

benchmarks/src/main/kotlin/com/espressodev/benchmarks/baselineprofile/BaselineProfileGenerator.kt renamed to benchmarks/src/main/java/com/espressodev/benchmarks/BaselineProfileGenerator.kt

@@ -1,9 +1,12 @@
-package com.espressodev.benchmarks.baselineprofile
+package com.espressodev.benchmarks
 
 import androidx.benchmark.macro.junit4.BaselineProfileRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
 
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
 
 /**
  * This test class generates a basic startup baseline profile for the target package.
@@ -28,6 +31,8 @@ import org.junit.Test
  *
  * The minimum required version of androidx.benchmark to generate a baseline profile is 1.2.0.
  **/
+@RunWith(AndroidJUnit4::class)
+@LargeTest
 class BaselineProfileGenerator {
 
     @get:Rule
@@ -38,6 +43,7 @@ class BaselineProfileGenerator {
         // This example works only with the variant with application id `com.espressodev.gptmap`."
         rule.collect(
             packageName = "com.espressodev.gptmap",
+            maxIterations = 3,
 
             // See: https://d.android.com/topic/performance/baselineprofiles/dex-layout-optimizations
             includeInStartupProfile = true

benchmarks/src/main/kotlin/com/espressodev/benchmarks/baselineprofile/StartupBenchmarks.kt renamed to benchmarks/src/main/java/com/espressodev/benchmarks/StartupBenchmarks.kt

@@ -1,15 +1,16 @@
-package com.espressodev.benchmarks.baselineprofile
+package com.espressodev.benchmarks
 
 import androidx.benchmark.macro.BaselineProfileMode
 import androidx.benchmark.macro.CompilationMode
 import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.StartupTimingMetric
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
-import androidx.test.rule.GrantPermissionRule
-import com.espressodev.benchmarks.allowWriteToExternal
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
 
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
 
 /**
  * This test class benchmarks the speed of app startup.
@@ -31,6 +32,8 @@ import org.junit.Test
  * For more information, see the [Macrobenchmark documentation](https://d.android.com/macrobenchmark#create-macrobenchmark)
  * and the [instrumentation arguments documentation](https://d.android.com/topic/performance/benchmarking/macrobenchmark-instrumentation-args).
  **/
+@RunWith(AndroidJUnit4::class)
+@LargeTest
 class StartupBenchmarks {
 
     @get:Rule
@@ -51,10 +54,9 @@ class StartupBenchmarks {
             metrics = listOf(StartupTimingMetric()),
             compilationMode = compilationMode,
             startupMode = StartupMode.COLD,
-            iterations = 10,
+            iterations = 3,
             setupBlock = {
                 pressHome()
-                allowWriteToExternal()
             },
             measureBlock = {
                 startActivityAndWait()
@@ -70,4 +72,4 @@ class StartupBenchmarks {
             }
         )
     }
-}
+}

benchmarks/src/main/kotlin/com/espressodev/benchmarks/GeneralActions.kt

@@ -18,12 +18,21 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
+    compileOnly(libs.android.gradlePlugin)
+    compileOnly(libs.android.tools.common)
+    compileOnly(libs.firebase.crashlytics.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
-    compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.detekt.gradlePlugin)
 }
 
+tasks {
+    validatePlugins {
+        enableStricterValidation = true
+        failOnWarning = true
+    }
+}
+
 gradlePlugin {
     plugins {
         register("androidApplicationCompose") {

build-logic/convention/build.gradle.kts

@@ -1,7 +1,10 @@
+import com.android.build.api.dsl.ApplicationExtension
 import com.espressodev.gptmap.ext.implementation
 import com.espressodev.gptmap.libs
+import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 
 class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
@@ -13,6 +16,8 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
             }
 
             dependencies {
+                val bom = libs.findLibrary("firebase-bom").get()
+                add("implementation", platform(bom))
                 implementation(libs.findLibrary("firebase-auth").get())
                 implementation(libs.findLibrary("firebase-firestore").get())
                 implementation(libs.findLibrary("firebase-crashlytics").get())
@@ -21,6 +26,17 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
                 implementation(libs.findLibrary("play-services-location").get())
                 implementation(libs.findLibrary("play-services-maps").get())
             }
+
+//            extensions.configure<ApplicationExtension> {
+//                buildTypes.configureEach {
+//                    // Disable the Crashlytics mapping file upload. This feature should only be
+//                    // enabled if a Firebase backend is available and configured in
+//                    // google-services.json.
+//                    configure<CrashlyticsExtension> {
+//                        mappingFileUploadEnabled = false
+//                    }
+//                }
+//            }
         }
     }
 }

build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt

@@ -10,7 +10,7 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures {

build-logic/convention/src/main/kotlin/com/espressodev/gptmap/AndroidCompose.kt

@@ -6,6 +6,7 @@ import org.gradle.api.Project
 internal fun LibraryAndroidComponentsExtension.disableUnnecessaryAndroidTests(
     project: Project,
 ) = beforeVariants {
-    it.enableAndroidTest = it.enableAndroidTest
+    it.androidTest.enable = it.androidTest.enable
             && project.projectDir.resolve("src/androidTest").exists()
 }
+

build-logic/convention/src/main/kotlin/com/espressodev/gptmap/AndroidInstrumentedTests.kt

@@ -9,7 +9,7 @@ import org.gradle.kotlin.dsl.invoke
  * Configure project for Gradle managed devices
  */
 internal fun configureGradleManagedDevices(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     val pixel4 = DeviceConfig("Pixel 4", 30, "aosp-atd")
     val pixel6 = DeviceConfig("Pixel 6", 31, "aosp")

build-logic/convention/src/main/kotlin/com/espressodev/gptmap/GradleManagedDevices.kt

@@ -1,7 +1,6 @@
 package com.espressodev.gptmap
 
 import com.android.build.api.dsl.CommonExtension
-import com.espressodev.gptmap.ext.androidTestImplementation
 import com.espressodev.gptmap.ext.implementation
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
@@ -13,7 +12,7 @@ import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = 34
@@ -80,4 +79,3 @@ private fun Project.configureKotlin() {
         }
     }
 }
-

build-logic/convention/src/main/kotlin/com/espressodev/gptmap/KotlinAndroid.kt

@@ -4,7 +4,6 @@ buildscript {
     }
     dependencies {
         classpath(libs.google.services)
-        classpath(libs.firebase.crashlytics.gradlePlugin)
         classpath(libs.google.oss.licenses.plugin) {
             exclude(group = "com.google.protobuf")
         }
@@ -33,6 +32,7 @@ subprojects {
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.test) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
@@ -41,7 +41,6 @@ plugins {
     alias(libs.plugins.secrets) apply false
     alias(libs.plugins.detekt) apply false
     alias(libs.plugins.gms) apply false
-    alias(libs.plugins.androidTest) apply false
-    alias(libs.plugins.jetbrainsKotlinAndroid) apply false
     alias(libs.plugins.baselineprofile) apply false
+    alias(libs.plugins.jetbrains.kotlin.android) apply false
 }

build.gradle.kts

@@ -7,7 +7,6 @@ import java.io.InputStream
 import java.io.OutputStream
 import javax.inject.Inject
 
-
 class UserPreferencesSerializer @Inject constructor() : Serializer<UserPreferences> {
     override val defaultValue: UserPreferences = UserPreferences.getDefaultInstance()
 
@@ -24,4 +23,3 @@ class UserPreferencesSerializer @Inject constructor() : Serializer<UserPreferenc
         t.writeTo(output)
     }
 }
-

core/datastore/src/main/kotlin/com/espressodev/gptmap/core/datastore/UserPreferencesSerializer.kt

@@ -36,6 +36,7 @@ import com.espressodev.gptmap.core.designsystem.TextType
 import com.espressodev.gptmap.core.designsystem.component.GmAlertDialog
 import com.espressodev.gptmap.core.designsystem.component.GmProgressIndicator
 import com.espressodev.gptmap.core.designsystem.component.GmTopAppBar
+import java.util.PriorityQueue
 import com.espressodev.gptmap.core.designsystem.R.drawable as AppDrawable
 import com.espressodev.gptmap.core.designsystem.R.string as AppText
 
@@ -65,6 +66,10 @@ fun DeleteProfileRoute(
         )
     }
 
+
+    val queue =
+        PriorityQueue<Map<Int, Int>> { a, b -> a.keys.first().compareTo(b.keys.first()) }
+
     if (isDialogOpened) {
         GmAlertDialog(
             title = AppText.delete_confirm,