Merge branch 'master' into wuandy/MemoryLRU

Author: wu-hui

.github/workflows/api-information.yml

@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/build-src-check.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/ci_tests.yml

@@ -22,7 +22,7 @@ jobs:
           submodules: true
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
@@ -50,7 +50,7 @@ jobs:
           submodules: true
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
@@ -100,7 +100,7 @@ jobs:
           submodules: true
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/fireperf-e2e.yml

@@ -28,7 +28,7 @@ jobs:
           token: ${{ secrets.GOOGLE_OSS_BOT_TOKEN }}
           path: firebase-android-buildtools
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/health-metrics.yml

@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
@@ -64,7 +64,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin
@@ -99,7 +99,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/make-bom.yml

@@ -13,7 +13,7 @@ jobs:
           python-version: '3.10'
       - uses: actions/[email protected]
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

.github/workflows/semver-check.yml

@@ -0,0 +1,17 @@
+name: Semver Check
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - 'releases/**'
+
+jobs:
+  build-artifacts:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Perform gradle build
+        run: |
+          ./gradlew semverCheckForRelease -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE

.github/workflows/smoke-tests.yml

@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 2
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 11
           distribution: temurin

appcheck/firebase-appcheck-debug-testing/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck-debug/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck-interop/api.txt

@@ -3,7 +3,7 @@ package com.google.firebase.appcheck {
 
   public abstract class AppCheckTokenResult {
     ctor public AppCheckTokenResult();
-    method @Nullable public abstract com.google.firebase.FirebaseException getError();
+    method @Nullable public abstract Exception getError();
     method @NonNull public abstract String getToken();
   }
 

appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle

@@ -42,8 +42,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-common:20.3.1'
-    implementation 'com.google.firebase:firebase-components:17.1.0'
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
 

appcheck/firebase-appcheck-interop/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.2
+version=17.0.0
 latestReleasedVersion=16.1.1

appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/AppCheckTokenResult.java

@@ -16,13 +16,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.firebase.FirebaseException;
 
 /**
  * Class to hold the result emitted by a Firebase App Check service application verification
  * attempt. The result will always contain a token, which will either be a valid raw JWT attesting
- * application identity, or a dummy value. The result may optionally contain a {@link
- * FirebaseException} if application verification does not succeed.
+ * application identity, or a dummy value. The result may optionally contain an {@link Exception} if
+ * application verification does not succeed.
  */
 public abstract class AppCheckTokenResult {
 
@@ -34,9 +33,9 @@ public abstract class AppCheckTokenResult {
   public abstract String getToken();
 
   /**
-   * Returns the {@link FirebaseException} if the {@link
-   * com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider} failed to obtain a token.
+   * Returns the {@link Exception} if the {@link
+   * com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider} failed to obtain a token.
    */
   @Nullable
-  public abstract FirebaseException getError();
+  public abstract Exception getError();
 }

appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InternalAppCheckTokenProvider.java renamed to appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InteropAppCheckTokenProvider.java

@@ -19,7 +19,7 @@
 import com.google.firebase.appcheck.AppCheckTokenResult;
 
 /** @hide */
-public interface InternalAppCheckTokenProvider {
+public interface InteropAppCheckTokenProvider {
 
   /**
    * Requests an {@link AppCheckTokenResult} from the installed {@code AppCheckFactory}. This will

appcheck/firebase-appcheck-playintegrity/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck/api.txt

@@ -15,7 +15,7 @@ package com.google.firebase.appcheck {
     method @NonNull public abstract String getToken();
   }
 
-  public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider {
+  public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider {
     ctor public FirebaseAppCheck();
     method public abstract void addAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
     method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getAppCheckToken(boolean);

appcheck/firebase-appcheck/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/StrictModeTest.java

@@ -18,7 +18,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.testing.integ.StrictModeRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,7 +43,7 @@ public void initializingFirebaseAppcheck_shouldNotViolateStrictMode() {
                       .build(),
                   "hello");
           app.get(FirebaseAppCheck.class);
-          app.get(InternalAppCheckTokenProvider.class);
+          app.get(InteropAppCheckTokenProvider.class);
         });
   }
 }

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.java

@@ -19,9 +19,9 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 
-public abstract class FirebaseAppCheck implements InternalAppCheckTokenProvider {
+public abstract class FirebaseAppCheck implements InteropAppCheckTokenProvider {
 
   /** Gets the default instance of {@code FirebaseAppCheck}. */
   @NonNull

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java

@@ -21,7 +21,7 @@
 import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.appcheck.internal.DefaultFirebaseAppCheck;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
@@ -53,7 +53,7 @@ public List<Component<?>> getComponents() {
         Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
 
     return Arrays.asList(
-        Component.builder(FirebaseAppCheck.class, (InternalAppCheckTokenProvider.class))
+        Component.builder(FirebaseAppCheck.class, (InteropAppCheckTokenProvider.class))
             .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(uiExecutor))

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenResult.java

@@ -58,7 +58,7 @@ public String getToken() {
 
   @Nullable
   @Override
-  public FirebaseException getError() {
+  public Exception getError() {
     return error;
   }
 }

build.gradle

@@ -36,7 +36,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.2'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
         classpath 'com.google.gms:google-services:4.3.15'

buildSrc/build.gradle.kts

@@ -40,6 +40,11 @@ ktfmt {
     googleStyle()
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 dependencies {
     // Firebase performance plugin, it should be added here because of how gradle dependency
     // resolution works, otherwise it breaks Fireperf Test Apps.
@@ -59,7 +64,7 @@ dependencies {
     implementation("org.eclipse.aether:aether-transport-http:1.0.0.v20140518")
     implementation("org.eclipse.aether:aether-transport-wagon:1.0.0.v20140518")
     implementation("org.apache.maven:maven-aether-provider:3.1.0")
-    
+
     implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
 
     implementation("com.google.code.gson:gson:2.8.9")
@@ -110,9 +115,3 @@ tasks.withType<Test> {
     val enablePluginTests: String? by rootProject
     enabled = enablePluginTests == "true"
 }
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-}

buildSrc/src/main/java/com/google/firebase/gradle/MultiProjectReleasePlugin.java

@@ -49,6 +49,12 @@
  */
 public class MultiProjectReleasePlugin implements Plugin<Project> {
 
+  // TODO() - Will be removed once migrated to Kotlin
+  private static String findStringProperty(Project p, String property) {
+    Object value = p.findProperty(property);
+    return value != null ? value.toString() : null;
+  }
+
   @Override
   public void apply(Project project) {
     project.apply(ImmutableMap.of("plugin", PublishingPlugin.class));
@@ -73,10 +79,10 @@ public void apply(Project project) {
                 ReleaseGenerator.class,
                 task -> {
                   task.getCurrentRelease()
-                      .convention(project.property("currentRelease").toString());
-                  task.getPastRelease().convention(project.property("pastRelease").toString());
+                      .convention(findStringProperty(project, "currentRelease"));
+                  task.getPastRelease().convention(findStringProperty(project, "pastRelease"));
                   task.getPrintReleaseConfig()
-                      .convention(project.property("printOutput").toString());
+                      .convention(findStringProperty(project, "printOutput"));
                   task.getReleaseConfigFile()
                       .convention(project.getLayout().getBuildDirectory().file("release.cfg"));
                   task.getReleaseReportFile()