Update Android build config and source fixes (#102)

DellaBitta · web-flow · commit 8e20c7227197 · 2022-07-06T15:16:23.000-04:00
A pass of the android build process to ensure the testapps can build prior to adding CI to the repo.
diff --git a/admob/testapp/build.gradle b/admob/testapp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -36,7 +36,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.admob.testapp'
-    minSdkVersion 16
+    minSdkVersion 26
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'
diff --git a/admob/testapp/gradle/wrapper/gradle-wrapper.properties b/admob/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/analytics/testapp/build.gradle b/analytics/testapp/build.gradle
@@ -22,6 +22,10 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
   compileSdkVersion 28
   buildToolsVersion '28.0.3'
 
@@ -36,7 +40,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.analytics.testapp'
-    minSdkVersion 16
+    minSdkVersion 19
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'
diff --git a/analytics/testapp/gradle/wrapper/gradle-wrapper.properties b/analytics/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/analytics/testapp/src/common_main.cc b/analytics/testapp/src/common_main.cc
@@ -63,9 +63,9 @@ extern "C" int common_main(int argc, const char* argv[]) {
   // Set the user ID.
   analytics::SetUserId("uber_user_510");
 
-  LogMessage("Set current screen.");
-  // Set the user's current screen.
-  analytics::SetCurrentScreen("Firebase Analytics C++ testapp", "testapp");
+  LogMessage("Log current screen.");
+  // Log the user's current screen.
+  analytics::LogEvent(analytics::kEventScreenView, "Firebase Analytics C++ testapp", "testapp" );
 
   // Log an event with no parameters.
   LogMessage("Log login event.");
diff --git a/auth/testapp/build.gradle b/auth/testapp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -22,6 +22,11 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
+
   compileSdkVersion 28
   buildToolsVersion '28.0.3'
 
@@ -36,7 +41,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.auth.testapp'
-    minSdkVersion 16
+    minSdkVersion 19
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'
diff --git a/auth/testapp/gradle/wrapper/gradle-wrapper.properties b/auth/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/database/testapp/build.gradle b/database/testapp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -22,6 +22,10 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
   compileSdkVersion 28
   buildToolsVersion '28.0.3'
 
@@ -36,7 +40,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.database.testapp'
-    minSdkVersion 16
+    minSdkVersion 19
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'
diff --git a/database/testapp/gradle/wrapper/gradle-wrapper.properties b/database/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/dynamic_links/testapp/build.gradle b/dynamic_links/testapp/build.gradle
@@ -22,6 +22,10 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
   compileSdkVersion 28
   buildToolsVersion '28.0.3'
 
@@ -36,7 +40,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.dynamiclinks.testapp'
-    minSdkVersion 16
+    minSdkVersion 19
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'
diff --git a/dynamic_links/testapp/gradle/wrapper/gradle-wrapper.properties b/dynamic_links/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+
diff --git a/firestore/testapp/build.gradle b/firestore/testapp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -22,8 +22,12 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 29
-  buildToolsVersion "29.0.0"
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
+  compileSdkVersion 28
+  buildToolsVersion "28.0.3"
 
   sourceSets {
     main {
@@ -36,8 +40,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.firestore.testapp'
-    minSdkVersion 16
-    targetSdkVersion 29
+    minSdkVersion 19
+    targetSdkVersion 28
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/firestore/testapp/gradle/wrapper/gradle-wrapper.properties b/firestore/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/functions/testapp/build.gradle b/functions/testapp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -22,6 +22,10 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
   compileSdkVersion 28
   buildToolsVersion '28.0.3'
 
@@ -36,7 +40,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.functions.testapp'
-    minSdkVersion 16
+    minSdkVersion 19
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'
diff --git a/functions/testapp/gradle/wrapper/gradle-wrapper.properties b/functions/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/messaging/testapp/build.gradle b/messaging/testapp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -22,16 +22,13 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
   compileSdkVersion 28
   buildToolsVersion '28.0.3'
 
-  android {
-      compileOptions {
-          sourceCompatibility 1.8
-          targetCompatibility 1.8
-      }
-  }
-
   sourceSets {
     main {
       jniLibs.srcDirs = ['libs']
@@ -43,7 +40,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.messaging.testapp'
-    minSdkVersion 16
+    minSdkVersion 19
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'
diff --git a/messaging/testapp/gradle/wrapper/gradle-wrapper.properties b/messaging/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/remote_config/testapp/build.gradle b/remote_config/testapp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }
@@ -22,6 +22,10 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
+  compileOptions {
+    sourceCompatibility 1.8
+    targetCompatibility 1.8
+  }
   compileSdkVersion 28
   buildToolsVersion '28.0.3'
 
@@ -36,7 +40,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.remoteconfig.testapp'
-    minSdkVersion 16
+    minSdkVersion 19
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'
diff --git a/remote_config/testapp/gradle/wrapper/gradle-wrapper.properties b/remote_config/testapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/remote_config/testapp/src/common_main.cc b/remote_config/testapp/src/common_main.cc
diff --git a/storage/testapp/build.gradle b/storage/testapp/build.gradle
diff --git a/storage/testapp/gradle/wrapper/gradle-wrapper.properties b/storage/testapp/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.2.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.3.3'`
`10`	`10`	`classpath 'com.google.gms:google-services:4.0.1'`
`11`	`11`	`}`
`12`	`12`	`}`
`@@ -36,7 +36,7 @@ android {`
`36`	`36`
`37`	`37`	`defaultConfig {`
`38`	`38`	`applicationId 'com.google.android.admob.testapp'`
`39`		`- minSdkVersion 16`
	`39`	`+ minSdkVersion 26`
`40`	`40`	`targetSdkVersion 28`
`41`	`41`	`versionCode 1`
`42`	`42`	`versionName '1.0'`