Create release plugin

Fixes #28
bakdata · Mar 1, 2024 · 4fba9b9 · 4fba9b9
1 parent 0dd3437
commit 4fba9b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/release/src/main/kotlin/com/bakdata/gradle/ReleasePlugin.kt b/release/src/main/kotlin/com/bakdata/gradle/ReleasePlugin.kt
@@ -42,7 +42,7 @@ class ReleasePlugin : Plugin<Project> {
             apply(plugin = "net.researchgate.release")
 
             val disablePushToRemote: String? = project.findProperty("disablePushToRemote") as? String
-            disablePushToRemote?.takeIf { it.toBoolean() }.apply {
+            if (disablePushToRemote?.toBoolean() == true) {
                 configure<ReleaseExtension> {
                     git {
                         pushToRemote.set(false)

diff --git a/release/src/test/kotlin/com/bakdata/gradle/ReleasePluginTest.kt b/release/src/test/kotlin/com/bakdata/gradle/ReleasePluginTest.kt
@@ -32,6 +32,7 @@ import org.assertj.core.api.Condition
 import org.assertj.core.api.SoftAssertions
 import org.gradle.api.Project
 import org.gradle.api.internal.project.DefaultProject
+import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.findByType
 import org.gradle.testfixtures.ProjectBuilder
 import org.junit.jupiter.api.Test
@@ -54,8 +55,8 @@ internal class ReleasePluginTest {
         SoftAssertions.assertSoftly { softly ->
             softly.assertThat(project.plugins)
                 .haveExactly(1, Condition({ it is ReleasePlugin }, "Has release plugin"))
-            softly.assertThat(project.extensions.findByType<ReleaseExtension>()?.git?.pushToRemote)
-                .isNull()
+            softly.assertThat(project.extensions.findByType<ReleaseExtension>()?.git?.pushToRemote?.get())
+                .isEqualTo("origin")
         }
     }
 
@@ -64,16 +65,16 @@ internal class ReleasePluginTest {
         val project = ProjectBuilder.builder().build()
 
         assertThatCode {
+            project.extra.set("disablePushToRemote", "false")
             project.pluginManager.apply("com.bakdata.release")
-            project.setProperty("disablePushToRemote", "true")
             project.evaluate()
         }.doesNotThrowAnyException()
 
         SoftAssertions.assertSoftly { softly ->
             softly.assertThat(project.plugins)
                 .haveExactly(1, Condition({ it is ReleasePlugin }, "Has release plugin"))
-            softly.assertThat(project.extensions.findByType<ReleaseExtension>()?.git?.pushToRemote)
-                .isEqualTo(false)
+            softly.assertThat(project.extensions.findByType<ReleaseExtension>()?.git?.pushToRemote?.get())
+                .isEqualTo("origin")
         }
     }
 
@@ -82,16 +83,16 @@ internal class ReleasePluginTest {
         val project = ProjectBuilder.builder().build()
 
         assertThatCode {
+            project.extra.set("disablePushToRemote", "true")
             project.pluginManager.apply("com.bakdata.release")
-            project.setProperty("disablePushToRemote", "true")
             project.evaluate()
         }.doesNotThrowAnyException()
 
         SoftAssertions.assertSoftly { softly ->
             softly.assertThat(project.plugins)
                 .haveExactly(1, Condition({ it is ReleasePlugin }, "Has release plugin"))
-            softly.assertThat(project.extensions.findByType<ReleaseExtension>()?.git?.pushToRemote)
-                .isNull()
+            softly.assertThat(project.extensions.findByType<ReleaseExtension>()?.git?.pushToRemote?.get())
+                .isEqualTo(false)
         }
     }