build dependency fixes in gradle: depend on SwiftKit as well

Author: ktoso

.github/workflows/pull_request.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Prepare CI Environment
         uses: ./.github/actions/prepare_env
       - name: Gradle :SwiftKit:build
-        run: ./gradlew build -x test # just build
+        run: ./gradlew build -x test
       - name: Gradle :SwiftKit:check
         run: ./gradlew :SwiftKit:check --info
       - name: Gradle compile JMH benchmarks

Samples/JExtractPluginSampleApp/build.gradle

@@ -36,7 +36,7 @@ java {
 
 // This is for development, when we edit the Swift swift-java project, the outputs of the generated sources may change.
 // Thus, we also need to watch and re-build the top level project.
-def buildJExtractPlugin = tasks.register("swiftBuildJExtractPlugin", Exec) {
+def compileSwiftJExtractPlugin = tasks.register("compileSwiftJExtractPlugin", Exec) {
     description = "Rebuild the swift-java root project"
 
     inputs.file(new File(rootDir, "Package.swift"))
@@ -45,25 +45,41 @@ def buildJExtractPlugin = tasks.register("swiftBuildJExtractPlugin", Exec) {
 
     workingDir = rootDir
     commandLine "swift"
-    args "build"
+    args("build",
+            "--product", "SwiftKitSwift",
+            "--product", "JExtractSwiftPlugin",
+            "--product", "JExtractSwiftCommandPlugin")
+}
+def compileSwiftKitSwift = tasks.register("compileSwiftKitSwift", Exec) {
+    description = "Rebuild the swift-java root project"
+
+    inputs.file(new File(rootDir, "Package.swift"))
+    inputs.dir(new File(rootDir, "Sources"))
+    outputs.dir(new File(rootDir, ".build"))
+
+    workingDir = rootDir
+    commandLine "swift"
+    args("build",
+            "--product", "SwiftKitSwift")
 }
 
-def swiftClean = tasks.register("swiftClean", Exec) {
+def cleanSwift = tasks.register("cleanSwift", Exec) {
     workingDir = layout.projectDirectory
     commandLine "swift"
     args("package", "clean")
 }
 
 def jextract = tasks.register("jextract", Exec) {
     description = "Builds swift sources, including swift-java source generation"
-    dependsOn buildJExtractPlugin
+    dependsOn compileSwiftJExtractPlugin
+    dependsOn compileSwiftKitSwift
 
     // only because we depend on "live developing" the plugin while using this project to test it
     inputs.file(new File(rootDir, "Package.swift"))
     inputs.dir(new File(rootDir, "Sources"))
 
-    inputs.file(layout.projectDirectory.file("Package.swift"))
-    inputs.dir(layout.projectDirectory.dir("Sources"))
+    inputs.file(new File(projectDir, "Package.swift"))
+    inputs.dir(new File(projectDir, "Sources"))
 
     // TODO: we can use package describe --type json to figure out which targets depend on JExtractSwiftPlugin and will produce outputs
     //       Avoid adding this directory, but create the expected one specifically for all targets
@@ -100,7 +116,7 @@ tasks.build {
 }
 
 tasks.clean {
-    dependsOn("swiftClean")
+    dependsOn("cleanSwift")
 }
 
 dependencies {

Samples/SwiftKitSampleApp/build.gradle

@@ -37,7 +37,7 @@ java {
 
 // This is for development, when we edit the Swift swift-java project, the outputs of the generated sources may change.
 // Thus, we also need to watch and re-build the top level project.
-def buildJExtractPlugin = tasks.register("swiftBuildJExtractPlugin", Exec) {
+def compileSwiftJExtractPlugin = tasks.register("compileSwiftJExtractPlugin", Exec) {
     description = "Rebuild the swift-java root project"
 
     inputs.file(new File(rootDir, "Package.swift"))
@@ -46,25 +46,22 @@ def buildJExtractPlugin = tasks.register("swiftBuildJExtractPlugin", Exec) {
 
     workingDir = rootDir
     commandLine "swift"
-    args "build"
-}
-
-def swiftClean = tasks.register("swiftClean", Exec) {
-    workingDir = layout.projectDirectory
-    commandLine "swift"
-    args("package", "clean")
+    args("build",
+            "--product", "SwiftKitSwift",
+            "--product", "JExtractSwiftPlugin",
+            "--product", "JExtractSwiftCommandPlugin")
 }
 
 def jextract = tasks.register("jextract", Exec) {
     description = "Builds swift sources, including swift-java source generation"
-    dependsOn buildJExtractPlugin
+    dependsOn compileSwiftJExtractPlugin
 
     // only because we depend on "live developing" the plugin while using this project to test it
     inputs.file(new File(rootDir, "Package.swift"))
     inputs.dir(new File(rootDir, "Sources"))
 
-    inputs.file(layout.projectDirectory.file("Package.swift"))
-    inputs.dir(layout.projectDirectory.dir("Sources"))
+    inputs.file(new File(projectDir, "Package.swift"))
+    inputs.dir(new File(projectDir, "Sources"))
 
     // TODO: we can use package describe --type json to figure out which targets depend on JExtractSwiftPlugin and will produce outputs
     //       Avoid adding this directory, but create the expected one specifically for all targets
@@ -110,8 +107,14 @@ tasks.build {
     dependsOn("jextract")
 }
 
+
+def cleanSwift = tasks.register("cleanSwift", Exec) {
+    workingDir = layout.projectDirectory
+    commandLine "swift"
+    args("package", "clean")
+}
 tasks.clean {
-    dependsOn("swiftClean")
+    dependsOn("cleanSwift")
 }
 
 dependencies {

SwiftKit/build.gradle

@@ -40,3 +40,32 @@ tasks.test {
         events("passed", "skipped", "failed")
     }
 }
+
+// SwiftKit depends on SwiftKitSwift (Swift library that this Java library calls into)
+
+def compileSwift = tasks.register("compileSwift", Exec) {
+    description "Compile the swift-java SwiftKitSwift dynamic library that SwiftKit (Java) calls into"
+
+    inputs.file(new File(rootDir, "Package.swift"))
+    inputs.dir(new File(rootDir, "Sources/")) // a bit generous, but better safe than sorry, and include all Swift source changes
+    outputs.dir(new File(rootDir, ".build"))
+
+    workingDir = rootDir
+    commandLine "swift"
+    args("build", "--target", "SwiftKitSwift")
+}
+tasks.build {
+    dependsOn("compileSwift")
+}
+
+
+
+def cleanSwift = tasks.register("cleanSwift", Exec) {
+    workingDir = rootDir
+    commandLine "swift"
+    args("package", "clean")
+}
+tasks.clean {
+    dependsOn("cleanSwift")
+}
+

buildSrc/build.gradle

@@ -15,3 +15,12 @@
 repositories {
     mavenCentral()
 }
+
+def cleanSwift = tasks.register("cleanSwift", Exec) {
+    workingDir = layout.projectDirectory
+    commandLine "swift"
+    args("package", "clean")
+}
+tasks.clean {
+    dependsOn("cleanSwift")
+}

settings.gradle

@@ -26,4 +26,3 @@ new File(rootDir, "Samples").listFiles().each {
         include ":Samples:${it.name}"
     }
 }
-