Merge pull request #87 from gradle/ot/fix/improve-publishing-fix-swift

Fix build missing Swift on Linux and publishing plugins
gradle · May 30, 2024 · 939778f · 939778f
2 parents 3aac942 + c9dc064
commit 939778f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/.teamcity/src/main/kotlin/projects/unified/UnifiedPrototypeProject.kt b/.teamcity/src/main/kotlin/projects/unified/UnifiedPrototypeProject.kt
@@ -17,6 +17,8 @@ object UnifiedPrototypeProject : Project({
         param("env.JAVA_HOME", "%linux.java17.openjdk.64bit%")
         param("env.ANDROID_HOME", "/opt/android/sdk")
         param("env.ANDROID_SDK_ROOT", "/opt/android/sdk")
+        // Add Swift to the path
+        param("env.PATH", "/opt/swift/latest/usr/bin:%env.PATH%")
     }
 
     val buildAndTest = buildType {

diff --git a/unified-prototype/unified-plugin/build.gradle.kts b/unified-prototype/unified-plugin/build.gradle.kts
@@ -7,11 +7,24 @@ subprojects {
     version = "0.1.2-SNAPSHOT"
 }
 
-tasks.register("publishAllPlugins") {
+val publishAllPlugins = tasks.register("publishAllPlugins") {
     description = "Publish all plugins in the build"
-    dependsOn(
-        ":plugin-android:publishPlugins",
-        ":plugin-jvm:publishPlugins",
-        ":plugin-kmp:publishPlugins",
-    )
+}
+subprojects {
+    plugins.withId("build-logic.publishing") {
+        publishAllPlugins.configure {
+            dependsOn(tasks.named("publishPlugins"))
+        }
+    }
+}
+
+val publishAllPluginsToMavenLocal = tasks.register("publishAllPluginsToMavenLocal") {
+    description = "Publish all plugins in the build to the Maven Local repository"
+}
+subprojects {
+    plugins.withId("build-logic.publishing") {
+        publishAllPluginsToMavenLocal.configure {
+            dependsOn(tasks.named("publishToMavenLocal"))
+        }
+    }
 }
diff --git a/unified-prototype/unified-plugin/plugin-swift/build.gradle.kts b/unified-prototype/unified-plugin/plugin-swift/build.gradle.kts
@@ -13,18 +13,24 @@ gradlePlugin {
     plugins {
         create("swift-library") {
             id = "org.gradle.experimental.swift-library"
+            displayName = "Swift Library Experimental Declarative Plugin"
+            description = "Experimental declarative plugin for Swift libraries"
             implementationClass = "org.gradle.api.experimental.swift.StandaloneSwiftLibraryPlugin"
-            tags = setOf("declarative-gradle")
+            tags = setOf("declarative-gradle", "swift")
         }
         create("swift-application") {
             id = "org.gradle.experimental.swift-application"
+            displayName = "Swift Application Experimental Declarative Plugin"
+            description = "Experimental declarative plugin for Swift applications"
             implementationClass = "org.gradle.api.experimental.swift.StandaloneSwiftApplicationPlugin"
-            tags = setOf("declarative-gradle")
+            tags = setOf("declarative-gradle", "swift")
         }
         create("swift-ecosystem") {
             id = "org.gradle.experimental.swift-ecosystem"
+            displayName = "Swift Ecosystem Experimental Declarative Plugin"
+            description = "Experimental declarative plugin for the Swift ecosystem"
             implementationClass = "org.gradle.api.experimental.swift.SwiftEcosystemPlugin"
-            tags = setOf("declarative-gradle")
+            tags = setOf("declarative-gradle", "swift")
         }
     }
 }