🐛 Workaround for crashing with project plugin (KT-37435) (#67)

* 🐛 Workaround for crashing with project plugin(KT-37435) * 🔖 Release 0.0.7 * 🔖 Release 0.0.7 * ⬆️ Upgrade nebula plugins
ButterCam · Aug 31, 2020 · b7842f4 · b7842f4
1 parent 73ab160
commit b7842f4
Show file tree

Hide file tree

Showing 14 changed files with 158 additions and 94 deletions.
diff --git a/.gitmoji-changelogrc b/.gitmoji-changelogrc
@@ -2,6 +2,6 @@
   "project": {
     "name": "sisyphus",
     "description": "Sisyphus is the way how we provide backend services.",
-    "version": "0.0.6"
+    "version": "0.0.7"
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/dependencies/build.gradle.kts b/dependencies/build.gradle.kts
@@ -44,9 +44,9 @@ dependencies {
         api("org.springframework.boot:spring-boot-gradle-plugin:2.3.2.RELEASE")
         api("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
         api("com.github.ben-manes:gradle-versions-plugin:0.28.0")
-        api("com.netflix.nebula:nebula-publishing-plugin:17.3.0")
+        api("com.netflix.nebula:nebula-publishing-plugin:17.3.2")
         api("com.netflix.nebula:gradle-contacts-plugin:5.1.0")
-        api("com.netflix.nebula:gradle-info-plugin:8.4.0")
+        api("com.netflix.nebula:gradle-info-plugin:9.1.1")
         api("org.gradle.kotlin:plugins:1.3.6")
         api("com.gradle.publish:plugin-publish-plugin:0.12.0")
         api("org.eclipse.jgit:org.eclipse.jgit:5.8.1.202007141445-r")

diff --git a/...yphus-project-gradle-plugin/src/main/kotlin/com/bybutter/sisyphus/project/gradle/Utils.kt b/...yphus-project-gradle-plugin/src/main/kotlin/com/bybutter/sisyphus/project/gradle/Utils.kt
@@ -4,6 +4,19 @@ import java.net.URI
 import org.gradle.api.Project
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 
+internal fun Project.ensurePlugin(vararg ids: String, block: (Project) -> Unit): Boolean {
+    for (id in ids) {
+        if (!pluginManager.hasPlugin(id)) {
+            pluginManager.withPlugin(id) {
+                block(this)
+            }
+            return false
+        }
+    }
+
+    return true
+}
+
 internal inline fun Project.ensurePlugin(id: String, noinline block: (Project) -> Unit, returnBlock: () -> Unit) {
     if (!pluginManager.hasPlugin(id)) {
         pluginManager.withPlugin(id) {

diff --git a/...plugin/src/main/kotlin/com/bybutter/sisyphus/project/gradle/java/JavaBaseProjectPlugin.kt b/...plugin/src/main/kotlin/com/bybutter/sisyphus/project/gradle/java/JavaBaseProjectPlugin.kt
@@ -8,8 +8,10 @@ import org.gradle.api.Project
 
 class JavaBaseProjectPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("java-base", ::apply) {
-            return
+        target.ensurePlugin("java-base") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         val extension = target.extensions.getByType(SisyphusExtension::class.java)

diff --git a/...gin/src/main/kotlin/com/bybutter/sisyphus/project/gradle/java/JavaLibraryProjectPlugin.kt b/...gin/src/main/kotlin/com/bybutter/sisyphus/project/gradle/java/JavaLibraryProjectPlugin.kt
@@ -7,8 +7,10 @@ import org.gradle.api.Project
 
 class JavaLibraryProjectPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("java-library", ::apply) {
-            return
+        target.ensurePlugin("java-library") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         target.tryApplyPluginClass("nebula.plugin.publishing.maven.MavenPublishPlugin")

diff --git a/...in/src/main/kotlin/com/bybutter/sisyphus/project/gradle/java/JavaPlatformProjectPlugin.kt b/...in/src/main/kotlin/com/bybutter/sisyphus/project/gradle/java/JavaPlatformProjectPlugin.kt
@@ -9,8 +9,10 @@ import org.gradle.api.publish.maven.MavenPublication
 
 class JavaPlatformProjectPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("java-platform", ::apply) {
-            return
+        target.ensurePlugin("java-platform") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         target.tryApplyPluginClass("nebula.plugin.publishing.maven.MavenPublishPlugin")

diff --git a/.../src/main/kotlin/com/bybutter/sisyphus/project/gradle/publishing/ProjectContactsPlugin.kt b/.../src/main/kotlin/com/bybutter/sisyphus/project/gradle/publishing/ProjectContactsPlugin.kt
@@ -8,9 +8,12 @@ import org.gradle.api.Project
 
 class ProjectContactsPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("nebula.maven-base-publish", ::apply) {
-            return
+        target.ensurePlugin("nebula.maven-base-publish") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
+
         try {
             Class.forName("nebula.plugin.contacts.ContactsExtension")
         } catch (ex: ClassNotFoundException) {

diff --git a/...n/src/main/kotlin/com/bybutter/sisyphus/project/gradle/publishing/ProjectLicensePlugin.kt b/...n/src/main/kotlin/com/bybutter/sisyphus/project/gradle/publishing/ProjectLicensePlugin.kt
@@ -10,11 +10,10 @@ import org.gradle.api.publish.maven.MavenPublication
 
 class ProjectLicensePlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("nebula.maven-base-publish", ::apply) {
-            return
-        }
-        target.ensurePlugin("nebula.info-scm", ::apply) {
-            return
+        target.ensurePlugin("nebula.maven-base-publish", "nebula.info-scm") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         val file = detectLicenseFile(target) ?: return

diff --git a/...rc/main/kotlin/com/bybutter/sisyphus/project/gradle/publishing/ProjectPublishingPlugin.kt b/...rc/main/kotlin/com/bybutter/sisyphus/project/gradle/publishing/ProjectPublishingPlugin.kt
@@ -10,8 +10,10 @@ import org.gradle.api.publish.PublishingExtension
 
 class ProjectPublishingPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("nebula.maven-base-publish", ::apply) {
-            return
+        target.ensurePlugin("nebula.maven-base-publish") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         target.tryApplyPluginClass("nebula.plugin.info.InfoPlugin")

diff --git a/...n/src/main/kotlin/com/bybutter/sisyphus/project/gradle/publishing/ProjectSigningPlugin.kt b/...n/src/main/kotlin/com/bybutter/sisyphus/project/gradle/publishing/ProjectSigningPlugin.kt
@@ -10,8 +10,10 @@ import org.gradle.plugins.signing.SigningPlugin
 
 class ProjectSigningPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("nebula.maven-base-publish", ::apply) {
-            return
+        target.ensurePlugin("nebula.maven-base-publish") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         val sisyphus = target.extensions.getByType(SisyphusExtension::class.java)

diff --git a/...c/main/kotlin/com/bybutter/sisyphus/project/gradle/threepart/SisyphusAntlrKotlinPlugin.kt b/...c/main/kotlin/com/bybutter/sisyphus/project/gradle/threepart/SisyphusAntlrKotlinPlugin.kt
@@ -7,11 +7,10 @@ import org.gradle.api.tasks.SourceSetContainer
 
 class SisyphusAntlrKotlinPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("org.gradle.antlr", ::apply) {
-            return
-        }
-        target.ensurePlugin("kotlin", ::apply) {
-            return
+        target.ensurePlugin("org.gradle.antlr", "kotlin") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         val sourceSets = target.extensions.getByType(SourceSetContainer::class.java)

diff --git a/...in/src/main/kotlin/com/bybutter/sisyphus/project/gradle/threepart/SisyphusDockerPlugin.kt b/...in/src/main/kotlin/com/bybutter/sisyphus/project/gradle/threepart/SisyphusDockerPlugin.kt
@@ -10,8 +10,10 @@ import org.gradle.api.tasks.bundling.AbstractArchiveTask
 
 class SisyphusDockerPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("application", ::apply) {
-            return
+        target.ensurePlugin("application") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         val dockerFile = target.projectDir.resolve("Dockerfile")

diff --git a/...in/src/main/kotlin/com/bybutter/sisyphus/project/gradle/threepart/SisyphusKtlintPlugin.kt b/...in/src/main/kotlin/com/bybutter/sisyphus/project/gradle/threepart/SisyphusKtlintPlugin.kt
@@ -10,8 +10,10 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 class SisyphusKtlintPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.ensurePlugin("org.jlleitschuh.gradle.ktlint", ::apply) {
-            return
+        target.ensurePlugin("org.jlleitschuh.gradle.ktlint") {
+            apply(it)
+        }.also {
+            if (!it) return
         }
 
         val extension = target.extensions.getByType(KtlintExtension::class.java)