From 38263417e433f63ace744bbbe2fa1328bc9b706c Mon Sep 17 00:00:00 2001 From: Emily Ploszaj Date: Tue, 25 Feb 2025 16:52:46 -0600 Subject: [PATCH 1/4] Add copyApiTxtFile task --- .../firebase/gradle/plugins/CopyApiTask.kt | 35 +++++++++++++++++++ .../plugins/FirebaseAndroidLibraryPlugin.kt | 6 ++++ .../plugins/FirebaseJavaLibraryPlugin.kt | 6 ++++ .../plugins/FirebaseLibraryExtension.kt | 3 ++ 4 files changed, 50 insertions(+) create mode 100644 plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt new file mode 100644 index 00000000000..e1e66110029 --- /dev/null +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.firebase.gradle.plugins + +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction + +abstract class CopyApiTask : DefaultTask() { + @get:InputFile + abstract val apiTxtFile: RegularFileProperty + @get:OutputFile + abstract val output: RegularFileProperty + + @TaskAction + fun run() { + output.get().asFile.writeText(apiTxtFile.get().asFile.readText()) + } +} diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt index e0732174ae4..6d39072091f 100644 --- a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt @@ -18,6 +18,7 @@ package com.google.firebase.gradle.plugins import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin +import com.google.firebase.gradle.CopyApiTask import com.google.firebase.gradle.plugins.LibraryType.ANDROID import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin @@ -160,6 +161,11 @@ class FirebaseAndroidLibraryPlugin : BaseFirebaseLibraryPlugin() { .getLatestReleasedVersion() ) } + + project.tasks.register("copyApiTxtFile") { + apiTxtFile.set(project.file("api.txt")) + output.set(project.file("previous_api.txt")) + } } private fun setupApiInformationAnalysis(project: Project, android: LibraryExtension) { diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt index 0c7b2028f1c..feab1ae9887 100644 --- a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt @@ -16,6 +16,7 @@ package com.google.firebase.gradle.plugins +import com.google.firebase.gradle.CopyApiTask import com.google.firebase.gradle.plugins.LibraryType.JAVA import com.google.firebase.gradle.plugins.semver.ApiDiffer import com.google.firebase.gradle.plugins.semver.GmavenCopier @@ -103,6 +104,11 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() { dependsOn("copyPreviousArtifacts") } + + project.tasks.register("copyApiTxtFile") { + apiTxtFile.set(project.file("api.txt")) + output.set(project.file("previous_api.txt")) + } } private fun setupApiInformationAnalysis(project: Project) { diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt index 8da2d33fb5c..ecc69e0e5a4 100644 --- a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.kt @@ -241,6 +241,9 @@ constructor(val project: Project, val type: LibraryType) { val version: String get() = project.version.toString() + val previousVersion: String + get() = project.properties["latestReleasedVersion"].toString() + val path: String = project.path val runtimeClasspath: String = From 1dd0650a2a1995524de274c81a98c91309dd1d01 Mon Sep 17 00:00:00 2001 From: Emily Ploszaj Date: Tue, 25 Feb 2025 16:57:22 -0600 Subject: [PATCH 2/4] Resolve import --- .../firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt | 1 - .../google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt index 6d39072091f..5ec8dcb22cf 100644 --- a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseAndroidLibraryPlugin.kt @@ -18,7 +18,6 @@ package com.google.firebase.gradle.plugins import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin -import com.google.firebase.gradle.CopyApiTask import com.google.firebase.gradle.plugins.LibraryType.ANDROID import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt index feab1ae9887..0068f76e677 100644 --- a/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/FirebaseJavaLibraryPlugin.kt @@ -16,7 +16,6 @@ package com.google.firebase.gradle.plugins -import com.google.firebase.gradle.CopyApiTask import com.google.firebase.gradle.plugins.LibraryType.JAVA import com.google.firebase.gradle.plugins.semver.ApiDiffer import com.google.firebase.gradle.plugins.semver.GmavenCopier From 5a3f1bbbed8d8ef831ddc2e0a7eada4488987dae Mon Sep 17 00:00:00 2001 From: Emily Ploszaj Date: Wed, 26 Feb 2025 10:31:29 -0600 Subject: [PATCH 3/4] Format --- .../java/com/google/firebase/gradle/plugins/CopyApiTask.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt index e1e66110029..7f01564fdf9 100644 --- a/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt @@ -23,10 +23,8 @@ import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction abstract class CopyApiTask : DefaultTask() { - @get:InputFile - abstract val apiTxtFile: RegularFileProperty - @get:OutputFile - abstract val output: RegularFileProperty + @get:InputFile abstract val apiTxtFile: RegularFileProperty + @get:OutputFile abstract val output: RegularFileProperty @TaskAction fun run() { From 1cfa4ba125cf842a229e5cc8b1bbdf7417f047db Mon Sep 17 00:00:00 2001 From: Emily Ploszaj Date: Wed, 26 Feb 2025 12:13:16 -0600 Subject: [PATCH 4/4] Copyright --- .../main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt index 7f01564fdf9..2de8c01cd22 100644 --- a/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt +++ b/plugins/src/main/java/com/google/firebase/gradle/plugins/CopyApiTask.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google LLC + * Copyright 2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.