Remove application-id from macrobenchmark config file. (#2683)

Author: yifanyang

ci/fireci/fireciplugins/macrobenchmark.py

@@ -148,8 +148,7 @@ async def run(self):
 
   async def _create_benchmark_projects(self):
     app_name = self.test_app_config['name']
-    app_id = self.test_app_config['application-id']
-    self.logger.info(f'Creating test app "{app_name}" with application-id "{app_id}"...')
+    self.logger.info(f'Creating test app "{app_name}"...')
 
     mustache_context = await self._prepare_mustache_context()
 
@@ -197,10 +196,8 @@ async def _execute_benchmark_tests(self):
 
   async def _prepare_mustache_context(self):
     app_name = self.test_app_config['name']
-    app_id = self.test_app_config['application-id']
 
     mustache_context = {
-      'application-id': app_id,
       'plugins': [],
       'dependencies': [],
     }

macrobenchmark/config.yaml

@@ -1,76 +1,64 @@
 baseline:
   name: baseline
-  application-id: com.google.firebase.benchmark.baseline
 
 firebase-config:
   name: config
-  application-id: com.google.firebase.benchmark.config
   dependencies:
     - com.google.firebase:firebase-config-ktx
 
 firebase-common:
   name: common
-  application-id: com.google.firebase.benchmark.baseline
   dependencies:
     - com.google.firebase:firebase-common
 
 firebase-crashlytics:
   name: crash
-  application-id: com.google.firebase.benchmark.crash
   dependencies:
     - com.google.firebase:firebase-crashlytics-ktx
   plugins:
     - com.google.firebase.crashlytics
 
 firebase-database:
   name: database
-  application-id: com.google.firebase.benchmark.database
   dependencies:
     - com.google.firebase:firebase-database-ktx
 
 firebase-dynamic-links:
   name: dynamiclinks
-  application-id: com.google.firebase.benchmark.dynamiclinks
   dependencies:
     - com.google.firebase:firebase-dynamic-links-ktx
 
 firebase-firestore:
   name: firestore
-  application-id: com.google.firebase.benchmark.firestore
   dependencies:
     - com.google.firebase:firebase-firestore-ktx
 
 firebase-functions:
   name: functions
-  application-id: com.google.firebase.benchmark.functions
   dependencies:
     - com.google.firebase:firebase-functions-ktx
 
 firebase-inappmessaging-display:
   name: inappmessaging
-  application-id: com.google.firebase.benchmark.inappmessaging
   dependencies:
     - com.google.firebase:[email protected]
     - com.google.firebase:firebase-inappmessaging-ktx
     - com.google.firebase:firebase-inappmessaging-display-ktx
 
 firebase-messaging:
   name: messaging
-  application-id: com.google.firebase.benchmark.messaging
   dependencies:
     - com.google.firebase:firebase-messaging-ktx
 
 firebase-perf:
   name: perf
-  application-id: com.google.firebase.benchmark.perf
   dependencies:
     - com.google.firebase:firebase-perf-ktx
   plugins:
     - com.google.firebase.firebase-perf
 
 firebase-storage:
   name: storage
-  application-id: com.google.firebase.benchmark.storage
   dependencies:
     - com.google.firebase:firebase-storage-ktx
 

macrobenchmark/template/app/build.gradle.mustache

@@ -25,7 +25,7 @@ android {
     buildToolsVersion '30.0.3'
 
     defaultConfig {
-        applicationId '{{application-id}}'
+        applicationId 'com.google.firebase.macrobenchmark'
         minSdkVersion 29
         targetSdkVersion 30
         versionCode 1
@@ -65,8 +65,8 @@ dependencies {
     {{/dependencies}}
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.1'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.2'

macrobenchmark/template/benchmark/build.gradle

@@ -48,11 +48,11 @@ android {
 }
 
 dependencies {
-    androidTestImplementation 'androidx.benchmark:benchmark-macro-junit4:1.1.0-SNAPSHOT'
+    androidTestImplementation 'androidx.benchmark:benchmark-macro-junit4:1.1.0-alpha02'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'

macrobenchmark/template/benchmark/src/androidTest/java/com/google/firebase/benchmark/BenchmarkTest.kt.mustache

@@ -31,14 +31,14 @@ class BenchmarkTest(private val startupMode: StartupMode) {
 
     @Test
     fun startup() = benchmarkRule.measureRepeated(
-        packageName = "{{application-id}}",
+        packageName = "com.google.firebase.macrobenchmark",
         metrics = listOf(StartupTimingMetric()),
         iterations = 20,
         startupMode = startupMode
     ) {
         pressHome()
         val intent = Intent()
-        intent.setPackage("{{application-id}}")
+        intent.setPackage("com.google.firebase.macrobenchmark")
         intent.setAction("com.google.firebase.benchmark.STARTUP_ACTIVITY")
         startActivityAndWait(intent)
     }

macrobenchmark/template/benchmark/src/main/AndroidManifest.xml.mustache

@@ -18,7 +18,7 @@
     package="com.google.firebase.benchmark">
 
     <queries>
-        <package android:name="{{application-id}}" />
+        <package android:name="com.google.firebase.macrobenchmark" />
     </queries>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />

macrobenchmark/template/build.gradle

@@ -13,13 +13,13 @@
 // limitations under the License.
 
 buildscript {
-    ext.kotlin_version = "1.4.32"
+    ext.kotlin_version = "1.5.0"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.0-rc01"
+        classpath "com.android.tools.build:gradle:4.2.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -40,11 +40,6 @@ allprojects {
         google()
         mavenCentral()
 
-        // snapshot repository for androidx - not necessary once alpha is public
-        maven {
-            url uri('https://androidx.dev/snapshots/builds/7205390/artifacts/repository')
-        }
-
         maven {
             url rootProject.file('../../../build/m2repository')
         }