Try to fix publication

korlibs · Sep 29, 2023 · dd3901b · dd3901b
1 parent 92db2cd
commit dd3901b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/korge-gradle-plugin-common/build.gradle.kts b/korge-gradle-plugin-common/build.gradle.kts
@@ -53,7 +53,18 @@ if (!KProjectVersionKt.exists() || KProjectVersionKt.text != KProjectVersionCont
 korlibs.NativeTools.groovyConfigurePublishing(project, false)
 korlibs.NativeTools.groovyConfigureSigning(project)
 
-val publishJvmPublicationToMavenLocal = tasks.register("publishJvmPublicationToMavenLocal", Task::class) {
-    group = "publishing"
-    dependsOn("publishToMavenLocal")
+tasks {
+    val publishJvmPublicationToMavenLocal = creating(Task::class) {
+        group = "publishing"
+        dependsOn("publishToMavenLocal")
+    }
+}
+
+afterEvaluate {
+    if (tasks.findByName("publishToMavenRepository") != null) {
+        tasks.register("publishJvmPublicationToMavenRepository", Task::class) {
+            group = "publishing"
+            dependsOn("publishToMavenRepository")
+        }
+    }
 }
diff --git a/korge-gradle-plugin-settings/build.gradle.kts b/korge-gradle-plugin-settings/build.gradle.kts
@@ -55,3 +55,13 @@ val publishJvmPublicationToMavenLocal = tasks.register("publishJvmPublicationToM
     dependsOn("publishPluginMavenPublicationToMavenLocal")
     dependsOn("publishToMavenLocal")
 }
+
+afterEvaluate {
+    if (tasks.findByName("publishToMavenRepository") != null) {
+        tasks.register("publishJvmPublicationToMavenRepository", Task::class) {
+            group = "publishing"
+            dependsOn("publishPluginMavenPublicationToMavenRepository")
+            dependsOn("publishToMavenRepository")
+        }
+    }
+}
diff --git a/korge-gradle-plugin/build.gradle.kts b/korge-gradle-plugin/build.gradle.kts
@@ -125,27 +125,26 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).configure
 
 //def publishAllPublications = false
 
-val publishJvmPublicationToMavenLocal = tasks.register("publishJvmPublicationToMavenLocal", Task::class) {
-    group = "publishing"
-    //dependsOn(publishAllPublications ? "publishToMavenLocal" : "publishPluginMavenPublicationToMavenLocal")
-    dependsOn("publishPluginMavenPublicationToMavenLocal")
-    dependsOn("publishKorgePluginMarkerMavenPublicationToMavenLocal")
+tasks {
+    val publishJvmPublicationToMavenLocal by creating(Task::class) {
+        group = "publishing"
+        //dependsOn(publishAllPublications ? "publishToMavenLocal" : "publishPluginMavenPublicationToMavenLocal")
+        dependsOn("publishPluginMavenPublicationToMavenLocal")
+        dependsOn("publishToMavenLocal")
+    }
 }
 
 // publishKorgePluginMarkerMavenPublicationToMavenLocal
 
 afterEvaluate {
     //def publishTaskOrNull = tasks.findByName(publishAllPublications ? "publishAllPublicationsToMavenRepository" : "publishPluginMavenPublicationToMavenRepository")
 
-    if (tasks.findByName("publishKorgePluginMarkerMavenPublicationToMavenRepository") != null) {
+    if (tasks.findByName("publishToMavenRepository") != null) {
         @Suppress("UNUSED_VARIABLE")
         val publishJvmPublicationToMavenRepository = tasks.register("publishJvmPublicationToMavenRepository", Task::class) {
             group = "publishing"
             dependsOn("publishPluginMavenPublicationToMavenRepository")
-            dependsOn("publishKorgePluginMarkerMavenPublicationToMavenRepository")
-            dependsOn("publishKorgeLibraryPluginMarkerMavenPublicationToMavenRepository")
-            dependsOn("publishKprojectPluginMarkerMavenPublicationToMavenRepository")
-            dependsOn("publishKprojectRootPluginMarkerMavenPublicationToMavenRepository")
+            dependsOn("publishToMavenRepository")
         }
     }
 }