Skip to content

Commit 9afe607

Browse files
VinayGuthalVinayGuthal
committed
move functions within classes
1 parent f6735ee commit 9afe607

File tree

3 files changed

+75
-75
lines changed

3 files changed

+75
-75
lines changed

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

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
package com.google.firebase.gradle.plugins
1515

1616
import com.google.firebase.gradle.plugins.ci.Coverage
17-
import com.google.firebase.gradle.plugins.semver.ApiDiffer
18-
import com.google.firebase.gradle.plugins.semver.GmavenCopier
1917
import java.io.File
2018
import java.nio.file.Paths
2119
import org.gradle.api.Plugin
2220
import org.gradle.api.Project
2321
import org.gradle.api.publish.PublishingExtension
2422
import org.gradle.api.publish.maven.MavenPublication
2523
import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
26-
import org.gradle.api.tasks.Copy
2724
import org.gradle.api.tasks.TaskProvider
2825
import org.gradle.kotlin.dsl.apply
2926
import org.gradle.kotlin.dsl.configure
@@ -84,74 +81,6 @@ abstract class BaseFirebaseLibraryPlugin : Plugin<Project> {
8481
}
8582
}
8683

87-
protected fun getSemverTaskJar(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
88-
project.mkdir("semver")
89-
project.tasks.register<GmavenCopier>("copyPreviousArtifacts") {
90-
dependsOn("jar")
91-
project.file("semver/previous.jar").delete()
92-
groupId.value(firebaseLibrary.groupId.get())
93-
artifactId.value(firebaseLibrary.artifactId.get())
94-
aarAndroidFile.value(false)
95-
filePath.value(project.file("semver/previous.jar").absolutePath)
96-
}
97-
val currentJarFile =
98-
project
99-
.file("build/libs/${firebaseLibrary.artifactId.get()}-${firebaseLibrary.version}.jar")
100-
.absolutePath
101-
val previousJarFile = project.file("semver/previous.jar").absolutePath
102-
project.tasks.register<ApiDiffer>("semverCheck") {
103-
currentJar.value(currentJarFile)
104-
previousJar.value(previousJarFile)
105-
version.value(firebaseLibrary.version)
106-
previousVersionString.value(
107-
GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
108-
.getLatestReleasedVersion()
109-
)
110-
111-
dependsOn("copyPreviousArtifacts")
112-
}
113-
}
114-
protected fun getSemverTaskAar(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
115-
project.mkdir("semver")
116-
project.tasks.register<GmavenCopier>("copyPreviousArtifacts") {
117-
dependsOn("bundleReleaseAar")
118-
project.file("semver/previous.aar").delete()
119-
120-
groupId.value(firebaseLibrary.groupId.get())
121-
artifactId.value(firebaseLibrary.artifactId.get())
122-
aarAndroidFile.value(true)
123-
filePath.value(project.file("semver/previous.aar").absolutePath)
124-
}
125-
126-
project.tasks.register<Copy>("extractCurrentClasses") {
127-
dependsOn("bundleReleaseAar")
128-
129-
from(project.zipTree("build/outputs/aar/${firebaseLibrary.artifactId.get()}-release.aar"))
130-
into(project.file("semver/current-version"))
131-
}
132-
project.tasks.register<Copy>("extractPreviousClasses") {
133-
dependsOn("copyPreviousArtifacts")
134-
135-
from(project.zipTree("semver/previous.aar"))
136-
into(project.file("semver/previous-version"))
137-
}
138-
139-
val currentJarFile = project.file("semver/current-version/classes.jar").absolutePath
140-
141-
val previousJarFile = project.file("semver/previous-version/classes.jar").absolutePath
142-
project.tasks.register<ApiDiffer>("semverCheck") {
143-
currentJar.value(currentJarFile)
144-
previousJar.value(previousJarFile)
145-
version.value(firebaseLibrary.version)
146-
previousVersionString.value(
147-
GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
148-
.getLatestReleasedVersion()
149-
)
150-
dependsOn("extractCurrentClasses")
151-
dependsOn("extractPreviousClasses")
152-
}
153-
}
154-
15584
protected fun getGenerateApiTxt(project: Project, srcDirs: Set<File>) =
15685
project.tasks.register<GenerateApiTxtTask>("generateApiTxtFile") {
15786
sources.value(project.provider { srcDirs })

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatExtension
1818
import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatPlugin
1919
import com.google.common.collect.ImmutableList
2020
import com.google.firebase.gradle.plugins.LibraryType.JAVA
21+
import com.google.firebase.gradle.plugins.semver.ApiDiffer
22+
import com.google.firebase.gradle.plugins.semver.GmavenCopier
2123
import org.gradle.api.Project
2224
import org.gradle.api.attributes.Attribute
2325
import org.gradle.api.plugins.JavaLibraryPlugin
@@ -52,6 +54,34 @@ class FirebaseJavaLibraryPlugin : BaseFirebaseLibraryPlugin() {
5254
configurePublishing(project, firebaseLibrary)
5355
}
5456

57+
private fun getSemverTaskJar(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
58+
project.mkdir("semver")
59+
project.tasks.register<GmavenCopier>("copyPreviousArtifacts") {
60+
dependsOn("jar")
61+
project.file("semver/previous.jar").delete()
62+
groupId.value(firebaseLibrary.groupId.get())
63+
artifactId.value(firebaseLibrary.artifactId.get())
64+
aarAndroidFile.value(false)
65+
filePath.value(project.file("semver/previous.jar").absolutePath)
66+
}
67+
val currentJarFile =
68+
project
69+
.file("build/libs/${firebaseLibrary.artifactId.get()}-${firebaseLibrary.version}.jar")
70+
.absolutePath
71+
val previousJarFile = project.file("semver/previous.jar").absolutePath
72+
project.tasks.register<ApiDiffer>("semverCheck") {
73+
currentJar.value(currentJarFile)
74+
previousJar.value(previousJarFile)
75+
version.value(firebaseLibrary.version)
76+
previousVersionString.value(
77+
GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
78+
.getLatestReleasedVersion()
79+
)
80+
81+
dependsOn("copyPreviousArtifacts")
82+
}
83+
}
84+
5585
private fun setupApiInformationAnalysis(project: Project) {
5686
val srcDirs =
5787
project.convention.getPlugin<JavaPluginConvention>().sourceSets.getByName("main").java.srcDirs

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

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormatPlugin
2121
import com.google.firebase.gradle.plugins.LibraryType.ANDROID
2222
import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer
2323
import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
24+
import com.google.firebase.gradle.plugins.semver.ApiDiffer
25+
import com.google.firebase.gradle.plugins.semver.GmavenCopier
2426
import java.io.File
2527
import org.gradle.api.JavaVersion
2628
import org.gradle.api.Project
2729
import org.gradle.api.attributes.Attribute
2830
import org.gradle.api.publish.tasks.GenerateModuleMetadata
29-
import org.gradle.kotlin.dsl.apply
30-
import org.gradle.kotlin.dsl.create
31-
import org.gradle.kotlin.dsl.getByType
32-
import org.gradle.kotlin.dsl.withType
31+
import org.gradle.api.tasks.Copy
32+
import org.gradle.kotlin.dsl.*
3333
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3434

3535
class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
@@ -85,6 +85,47 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
8585
configurePublishing(project, firebaseLibrary, android)
8686
}
8787

88+
private fun getSemverTaskAar(project: Project, firebaseLibrary: FirebaseLibraryExtension) {
89+
project.mkdir("semver")
90+
project.tasks.register<GmavenCopier>("copyPreviousArtifacts") {
91+
dependsOn("bundleReleaseAar")
92+
project.file("semver/previous.aar").delete()
93+
94+
groupId.value(firebaseLibrary.groupId.get())
95+
artifactId.value(firebaseLibrary.artifactId.get())
96+
aarAndroidFile.value(true)
97+
filePath.value(project.file("semver/previous.aar").absolutePath)
98+
}
99+
100+
project.tasks.register<Copy>("extractCurrentClasses") {
101+
dependsOn("bundleReleaseAar")
102+
103+
from(project.zipTree("build/outputs/aar/${firebaseLibrary.artifactId.get()}-release.aar"))
104+
into(project.file("semver/current-version"))
105+
}
106+
project.tasks.register<Copy>("extractPreviousClasses") {
107+
dependsOn("copyPreviousArtifacts")
108+
109+
from(project.zipTree("semver/previous.aar"))
110+
into(project.file("semver/previous-version"))
111+
}
112+
113+
val currentJarFile = project.file("semver/current-version/classes.jar").absolutePath
114+
115+
val previousJarFile = project.file("semver/previous-version/classes.jar").absolutePath
116+
project.tasks.register<ApiDiffer>("semverCheck") {
117+
currentJar.value(currentJarFile)
118+
previousJar.value(previousJarFile)
119+
version.value(firebaseLibrary.version)
120+
previousVersionString.value(
121+
GmavenHelper(firebaseLibrary.groupId.get(), firebaseLibrary.artifactId.get())
122+
.getLatestReleasedVersion()
123+
)
124+
dependsOn("extractCurrentClasses")
125+
dependsOn("extractPreviousClasses")
126+
}
127+
}
128+
88129
private fun setupApiInformationAnalysis(project: Project, android: LibraryExtension) {
89130
val srcDirs = android.sourceSets.getByName("main").java.srcDirs
90131

0 commit comments

Comments
 (0)