From 50246069fafb54fe9bc323898ec07d71e01c25ac Mon Sep 17 00:00:00 2001 From: Vinay Guthal Date: Wed, 5 Jul 2023 11:55:35 -0400 Subject: [PATCH 1/2] update --- .../firebase/gradle/plugins/FirebaseLibraryPlugin.kt | 8 +++++--- .../google/firebase/gradle/plugins/PomValidator.kt | 11 ++++++++--- .../firebase/gradle/plugins/semver/ApiDiffer.kt | 3 +++ .../firebase/gradle/plugins/semver/GmavenCopier.kt | 7 ++++++- firebase-config/ktx/ktx.gradle | 2 +- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt index fb9d55b7e12..77f1c7676e9 100644 --- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt +++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt @@ -109,11 +109,13 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() { from(project.zipTree("build/outputs/aar/${releaseAar}")) into(project.file("semver/current-version")) } + project.tasks.register("extractPreviousClasses") { dependsOn("copyPreviousArtifacts") - - from(project.zipTree("semver/previous.aar")) - into(project.file("semver/previous-version")) + if (project.file("semver/previous.aar").exists()) { + from(project.zipTree("semver/previous.aar")) + into(project.file("semver/previous-version")) + } } val currentJarFile = project.file("semver/current-version/classes.jar").absolutePath diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt index 56c06d4aa2a..7030be11562 100644 --- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt +++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt @@ -43,10 +43,15 @@ abstract class PomValidator : DefaultTask() { @TaskAction fun run() { - var diff = diffWithPomFromURL(getLatestReleasePomUrl()) + try { + var diff = diffWithPomFromURL(getLatestReleasePomUrl()) - if (diff.isNotEmpty()) { - throw GradleException("Dependency version errors found:\n${diff}") + if (diff.isNotEmpty()) { + throw GradleException("Dependency version errors found:\n${diff}") + } + } catch (_: java.io.FileNotFoundException) { + // New sdk gmaven artifact doesn't exist. + return } } diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt index 2d261ff54f2..ee23659c81d 100644 --- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt +++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt @@ -40,6 +40,9 @@ abstract class ApiDiffer : DefaultTask() { @TaskAction fun run() { + if (version.get().contains("beta") || previousVersionString.get().isNullOrEmpty()) { + return + } val (pMajor, pMinor, _) = previousVersionString.get().split(".") val (major, minor, _) = version.get().split(".") val curVersionDelta: VersionDelta = diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt index 833e32b3705..e450d9f745e 100644 --- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt +++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt @@ -41,6 +41,11 @@ abstract class GmavenCopier : DefaultTask() { mavenHelper.getLatestReleasedVersion(), !aarAndroidFile.get() ) - URL(gMavenPath).openStream().use { Files.copy(it, Paths.get(filePath.get())) } + try { + URL(gMavenPath).openStream().use { Files.copy(it, Paths.get(filePath.get())) } + } catch (_: java.io.FileNotFoundException) { + // Gmaven Artifact doesn't exist. + return + } } } diff --git a/firebase-config/ktx/ktx.gradle b/firebase-config/ktx/ktx.gradle index de20bb8e58d..fb3ae087050 100644 --- a/firebase-config/ktx/ktx.gradle +++ b/firebase-config/ktx/ktx.gradle @@ -51,7 +51,7 @@ dependencies { implementation project(':firebase-config') implementation 'com.google.firebase:firebase-abt:21.1.1' implementation 'com.google.firebase:firebase-installations-interop:17.1.0' - runtimeOnly project(':firebase-installations') + runtimeOnly 'com.google.firebase:firebase-installations:17.1.2' implementation 'androidx.annotation:annotation:1.1.0' From 73f04d5c457b9da6349511584f4e80a98bd5ba09 Mon Sep 17 00:00:00 2001 From: Vinay Guthal Date: Wed, 5 Jul 2023 11:57:08 -0400 Subject: [PATCH 2/2] update --- .../java/com/google/firebase/gradle/plugins/PomValidator.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt index 7030be11562..93546cf00a2 100644 --- a/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt +++ b/buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt @@ -50,7 +50,7 @@ abstract class PomValidator : DefaultTask() { throw GradleException("Dependency version errors found:\n${diff}") } } catch (_: java.io.FileNotFoundException) { - // New sdk gmaven artifact doesn't exist. + // Gmaven artifact doesn't exist. return } }