Minor tweaks to Implement App Startup #376.

tikurahul · tikurahul · commit c6d44679e3d9 · 2021-07-08T11:29:42.000-07:00
* This change buid on #376. * We don't really need `AnalyticsHelperInitializer` here. This is because the `AppModule` already `@Provides` the depency.
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -23,7 +23,7 @@ object Versions {
     const val TARGET_SDK = 30
     const val MIN_SDK = 21
 
-    const val ANDROID_GRADLE_PLUGIN = "7.0.0-beta03"
+    const val ANDROID_GRADLE_PLUGIN = "7.0.0-beta05"
     const val BENCHMARK = "1.0.0"
     const val COMPOSE = "1.0.0-beta04"
     const val FIREBASE_CRASHLYTICS = "2.3.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Feb 10 08:38:31 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/macrobenchmark/build.gradle b/macrobenchmark/build.gradle
@@ -8,8 +8,6 @@ android {
     defaultConfig {
         minSdkVersion 29
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,14 +29,14 @@ android {
     }
 
     targetProjectPath = ":mobile"
-    properties["android.experimental.self-instrumenting"] = true
+    experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 
 androidComponents {
     beforeVariants(selector().all()) {
         // enable only the release buildType, since we only want to measure
         // release build performance
-        enable = buildType == 'release'
+        enabled = buildType == 'release'
     }
 }
 
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
@@ -107,9 +107,7 @@
             <meta-data
                 android:name="com.google.samples.apps.iosched.util.initializers.TimberInitializer"
                 android:value="androidx.startup" />
-            <meta-data
-                android:name="com.google.samples.apps.iosched.util.initializers.AnalyticsHelperInitializer"
-                android:value="androidx.startup" />
+
         </provider>
         <!-- enable profiling by macrobenchmark -->
         <profileable
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/di/InitializerEntryPoint.kt b/mobile/src/main/java/com/google/samples/apps/iosched/di/InitializerEntryPoint.kt
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/util/initializers/AnalyticsHelperInitializer.kt b/mobile/src/main/java/com/google/samples/apps/iosched/util/initializers/AnalyticsHelperInitializer.kt

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ android {`
`8`	`8`	`defaultConfig {`
`9`	`9`	`minSdkVersion 29`
`10`	`10`	`targetSdkVersion 30`
`11`		`- versionCode 1`
`12`		`- versionName "1.0"`
`13`	`11`
`14`	`12`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`15`	`13`	`}`
`@@ -31,14 +29,14 @@ android {`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`targetProjectPath = ":mobile"`
`34`		`- properties["android.experimental.self-instrumenting"] = true`
	`32`	`+ experimentalProperties["android.experimental.self-instrumenting"] = true`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`androidComponents {`
`38`	`36`	`beforeVariants(selector().all()) {`
`39`	`37`	`// enable only the release buildType, since we only want to measure`
`40`	`38`	`// release build performance`
`41`		`- enable = buildType == 'release'`
	`39`	`+ enabled = buildType == 'release'`
`42`	`40`	`}`
`43`	`41`	`}`
`44`	`42`