Merge ae586d6 into dff55b6

firebase · Aug 24, 2023 · 0868375 · 0868375
2 parents dff55b6 + ae586d6
commit 0868375
Show file tree

Hide file tree

Showing 18 changed files with 1,093 additions and 102 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.2'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
         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'

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
@@ -84,6 +84,22 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
     android.testServer(FirebaseTestServer(project, firebaseLibrary.testLab, android))
     setupStaticAnalysis(project, firebaseLibrary)
     getIsPomValidTask(project, firebaseLibrary)
+<<<<<<< HEAD
+    getSemverTaskAar(project, firebaseLibrary)
+    getPackageTransform(project, firebaseLibrary)
+    configurePublishing(project, firebaseLibrary, android)
+  }
+
+  private fun getPackageTransform(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
+    project.tasks.register<PackageTransform>("packageTransform") {
+      groupId.set(firebaseLibrary.groupId.get())
+      artifactId.set(firebaseLibrary.artifactId.get())
+      projectPath.set(project.projectDir.absolutePath)
+    }
+  }
+
+  private fun getSemverTaskAar(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
+=======
     setupVersionCheckTasks(project, firebaseLibrary)
     configurePublishing(project, firebaseLibrary, android)
   }