优化buildSrc

kosaka-bun · Jun 5, 2024 · 79b0c16 · 79b0c16
1 parent cb5aaa4
commit 79b0c16
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 40 deletions.
diff --git a/aar/build.gradle.kts b/aar/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.android.build.gradle.internal.api.DefaultAndroidSourceDirectorySet
-import de.honoka.gradle.buildsrc.MavenPublish
 import de.honoka.gradle.buildsrc.MavenPublish.defineAarSourcesJarTask
 import de.honoka.gradle.buildsrc.MavenPublish.setupAarVersionAndPublishing
 import de.honoka.gradle.buildsrc.publishing
@@ -32,9 +31,8 @@ android {
 
     sourceSets["main"].java {
         srcDir("/patchSrc/main/java")
-        if(this is DefaultAndroidSourceDirectorySet) {
-            MavenPublish.sourceDirSet = srcDirs
-        }
+        val sourceDirSet = if(this is DefaultAndroidSourceDirectorySet) srcDirs else setOf()
+        defineAarSourcesJarTask(sourceDirSet)
     }
 
     compileOptions {
@@ -83,4 +81,3 @@ publishing {
 }
 
 setupAarVersionAndPublishing(libs.versions.aar.get())
-defineAarSourcesJarTask()
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     `kotlin-dsl`
 }
 
+//noinspection UseTomlInstead
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.0")
 }
diff --git a/buildSrc/src/main/java/de/honoka/gradle/buildsrc/MavenPublish.kt b/buildSrc/src/main/java/de/honoka/gradle/buildsrc/MavenPublish.kt
@@ -2,6 +2,7 @@ package de.honoka.gradle.buildsrc
 
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
+import org.gradle.api.publish.maven.MavenPom
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.create
@@ -16,8 +17,6 @@ object MavenPublish {
 
     private val projectsWillPublish = ArrayList<Project>()
 
-    var sourceDirSet: Set<File> = setOf()
-
     fun Project.setupAarVersionAndPublishing(version: String) {
         val project = this
         this.version = version
@@ -34,36 +33,7 @@ object MavenPublish {
                     groupId = group as String
                     artifactId = rootProject.name
                     this.version = version
-                    pom.withXml {
-                        val apiDependencies = ArrayList<String>()
-                        project.configurations["api"].allDependencies.forEach {
-                            apiDependencies.add("${it.group}:${it.name}")
-                        }
-                        asNode().appendNode("dependencies").run {
-                            project.configurations.implementation.configure {
-                                allDependencies.forEach {
-                                    val isInvalidDependency = it.group == null ||
-                                        it.name.lowercase() == "unspecified" ||
-                                        it.version == null
-                                    if(isInvalidDependency) return@forEach
-                                    val moduleName = "${it.group}:${it.name}"
-                                    appendNode("dependency").run {
-                                        val subNodes = hashMapOf(
-                                            "groupId" to it.group,
-                                            "artifactId" to it.name,
-                                            "version" to it.version
-                                        )
-                                        if(!apiDependencies.contains(moduleName)) {
-                                            subNodes["scope"] = "runtime"
-                                        }
-                                        subNodes.forEach { entry ->
-                                            appendNode(entry.key, entry.value)
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
+                    pom.setAndroidAarPomDependencies(project)
                     afterEvaluate {
                         val artifacts = listOf(
                             tasks["bundleReleaseAar"],
@@ -77,7 +47,38 @@ object MavenPublish {
         projectsWillPublish.add(this)
     }
 
-    fun Project.defineAarSourcesJarTask() {
+    private fun MavenPom.setAndroidAarPomDependencies(project: Project) = withXml {
+        val apiDependencies = ArrayList<String>()
+        project.configurations["api"].allDependencies.forEach {
+            apiDependencies.add("${it.group}:${it.name}")
+        }
+        asNode().appendNode("dependencies").run {
+            project.configurations.implementation.configure {
+                allDependencies.forEach {
+                    val isInvalidDependency = it.group == null ||
+                        it.name.lowercase() == "unspecified" ||
+                        it.version == null
+                    if(isInvalidDependency) return@forEach
+                    val moduleName = "${it.group}:${it.name}"
+                    appendNode("dependency").run {
+                        val subNodes = hashMapOf(
+                            "groupId" to it.group,
+                            "artifactId" to it.name,
+                            "version" to it.version
+                        )
+                        if(!apiDependencies.contains(moduleName)) {
+                            subNodes["scope"] = "runtime"
+                        }
+                        subNodes.forEach { entry ->
+                            appendNode(entry.key, entry.value)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fun Project.defineAarSourcesJarTask(sourceDirSet: Set<File>) {
         tasks.register("sourcesJar", Jar::class.java) {
             group = "build"
             destinationDirectory.set(Paths.get(buildDir.absolutePath, "libs").toFile())

diff --git a/buildSrc/src/main/java/de/honoka/gradle/buildsrc/Project.kt b/buildSrc/src/main/java/de/honoka/gradle/buildsrc/Project.kt
@@ -31,8 +31,8 @@ val Project.rawDependencies: Set<Dependency>
         }
         val set = HashSet<Dependency>()
         configurationContainer.forEach {
-            it.dependencies.forEach {
-                set.add(it as Dependency)
+            it.dependencies.forEach { dep ->
+                set.add(dep as Dependency)
             }
         }
         return set