Skip to content

Commit d68ed5c

Browse files
authored
Update semver tests and the pom validator tests to handle new sdk (#5133)
* update * update
1 parent 1e44257 commit d68ed5c

File tree

5 files changed

+23
-8
lines changed

5 files changed

+23
-8
lines changed

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,13 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
109109
from(project.zipTree("build/outputs/aar/${releaseAar}"))
110110
into(project.file("semver/current-version"))
111111
}
112+
112113
project.tasks.register<Copy>("extractPreviousClasses") {
113114
dependsOn("copyPreviousArtifacts")
114-
115-
from(project.zipTree("semver/previous.aar"))
116-
into(project.file("semver/previous-version"))
115+
if (project.file("semver/previous.aar").exists()) {
116+
from(project.zipTree("semver/previous.aar"))
117+
into(project.file("semver/previous-version"))
118+
}
117119
}
118120

119121
val currentJarFile = project.file("semver/current-version/classes.jar").absolutePath

buildSrc/src/main/java/com/google/firebase/gradle/plugins/PomValidator.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,15 @@ abstract class PomValidator : DefaultTask() {
4343

4444
@TaskAction
4545
fun run() {
46-
var diff = diffWithPomFromURL(getLatestReleasePomUrl())
46+
try {
47+
var diff = diffWithPomFromURL(getLatestReleasePomUrl())
4748

48-
if (diff.isNotEmpty()) {
49-
throw GradleException("Dependency version errors found:\n${diff}")
49+
if (diff.isNotEmpty()) {
50+
throw GradleException("Dependency version errors found:\n${diff}")
51+
}
52+
} catch (_: java.io.FileNotFoundException) {
53+
// Gmaven artifact doesn't exist.
54+
return
5055
}
5156
}
5257

buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/ApiDiffer.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ abstract class ApiDiffer : DefaultTask() {
4040

4141
@TaskAction
4242
fun run() {
43+
if (version.get().contains("beta") || previousVersionString.get().isNullOrEmpty()) {
44+
return
45+
}
4346
val (pMajor, pMinor, _) = previousVersionString.get().split(".")
4447
val (major, minor, _) = version.get().split(".")
4548
val curVersionDelta: VersionDelta =

buildSrc/src/main/java/com/google/firebase/gradle/plugins/semver/GmavenCopier.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ abstract class GmavenCopier : DefaultTask() {
4141
mavenHelper.getLatestReleasedVersion(),
4242
!aarAndroidFile.get()
4343
)
44-
URL(gMavenPath).openStream().use { Files.copy(it, Paths.get(filePath.get())) }
44+
try {
45+
URL(gMavenPath).openStream().use { Files.copy(it, Paths.get(filePath.get())) }
46+
} catch (_: java.io.FileNotFoundException) {
47+
// Gmaven Artifact doesn't exist.
48+
return
49+
}
4550
}
4651
}

firebase-config/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
implementation project(':firebase-config')
5252
implementation 'com.google.firebase:firebase-abt:21.1.1'
5353
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
54-
runtimeOnly project(':firebase-installations')
54+
runtimeOnly 'com.google.firebase:firebase-installations:17.1.2'
5555

5656
implementation 'androidx.annotation:annotation:1.1.0'
5757

0 commit comments

Comments
 (0)