Fix conflicting doFirst declarations in Gradle task

thewca · Oct 2, 2020 · ff3fd57 · ff3fd57
1 parent 712222f
commit ff3fd57
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -54,13 +54,15 @@ tasks.create("registerReleaseTag") {
         val signature = createBuildSignature(privateKeyPath, fileToSign)
 
         signatureStorage.writeBytes(signature)
-    }
 
-    setTNoodleRelease(project.ext, releasePrefix)
+        setTNoodleRelease(project.ext, releasePrefix)
+    }
 }
 
 tasks.create("registerCloudReleaseTag") {
-    setTNoodleRelease(project.ext, "TNoodle-CLOUD")
+    doFirst {
+        setTNoodleRelease(project.ext, "TNoodle-CLOUD")
+    }
 }
 
 tasks.create<ProGuardTask>("minifyRelease") {

diff --git a/buildSrc/src/main/kotlin/configurations/ProjectVersions.kt b/buildSrc/src/main/kotlin/configurations/ProjectVersions.kt
@@ -21,10 +21,8 @@ object ProjectVersions {
     }
 
     fun Task.setTNoodleRelease(ext: ExtraPropertiesExtension, name: String, version: String? = null) {
-        doFirst {
-            ext.set(TNOODLE_IMPL_KEY, name)
-            ext.set(TNOODLE_VERSION_KEY, version ?: project.version)
-        }
+        ext.set(TNOODLE_IMPL_KEY, name)
+        ext.set(TNOODLE_VERSION_KEY, version ?: project.version)
     }
 
     fun Project.tNoodleImplOrDefault(): String {