wip: bringing validation of sample to linux

Author: ktoso

Samples/SwiftAndJavaJarSampleLib/build.gradle

@@ -78,8 +78,14 @@ def swiftProductsWithJExtractPlugin() {
     }
 }
 
+def swiftCheckValid = tasks.register("swift-check-valid", Exec) {
+    commandLine "swift"
+    args("-version")
+}
+
 def jextract = tasks.register("jextract", Exec) {
     description = "Generate Java wrappers for swift target"
+    dependsOn swiftCheckValid
     // dependsOn compileSwiftJExtractPlugin
 
     // only because we depend on "live developing" the plugin while using this project to test it
@@ -90,7 +96,8 @@ def jextract = tasks.register("jextract", Exec) {
     inputs.file(new File(projectDir, "Package.swift"))
 
     // monitor all targets/products which depend on the JExtract plugin
-    swiftProductsWithJExtractPlugin().each {
+    // swiftProductsWithJExtractPlugin().each {
+    ["MySwiftLibrary"].each {
         logger.info("[swift-java:jextract (Gradle)] Swift input target: ${it}")
         inputs.dir(new File(layout.projectDirectory.asFile, "Sources/${it}".toString()))
     }

Samples/SwiftAndJavaJarSampleLib/ci-validate.sh

@@ -8,9 +8,13 @@ set -x
 # check if we can compile a plain Example file that uses the generated Java bindings that should be in the generated jar
 javac -cp bin/default/build/libs/*jar Example.java
 
-# Can we run the example?
-# - find libswiftCore.dylib
-SWIFT_DYLIB_PATHS=$(find "$(swiftly use --print-location)" | grep dylib$ | grep libswiftCore | grep macos | xargs dirname)
-# - find our library dylib
-SWIFT_DYLIB_PATHS="${SWIFT_DYLIB_PATHS}:$(find . | grep libMySwiftLibrary.dylib$ | sort | head -n1 | xargs dirname)"
-java -Djava.library.path="${SWIFT_DYLIB_PATHS}" -cp ".:bin/default/build/libs/*jar:../../SwiftKit/build/libs/*jar" Example
+if [[ "$(uname -s)" -eq 'Linux' ]]
+then
+  # Can we run the example?
+  # - find libswiftCore.dylib
+  SWIFT_DYLIB_PATHS=$(find "$(swiftly use --print-location)" | grep dylib$ | grep libswiftCore | grep macos | xargs dirname)
+  # - find our library dylib
+  SWIFT_DYLIB_PATHS="${SWIFT_DYLIB_PATHS}:$(find . | grep libMySwiftLibrary.dylib$ | sort | head -n1 | xargs dirname)"
+  java -Djava.library.path="${SWIFT_DYLIB_PATHS}" -cp ".:bin/default/build/libs/*jar:../../SwiftKit/build/libs/*jar" Example
+elif [[ "$(uname -s)" -eq 'Darwin' ]]
+fi

Samples/SwiftKitSampleApp/build.gradle

@@ -30,13 +30,19 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(22))
+        languageVersion.set(JavaLanguageVersion.of(23))
     }
 }
 
+def swiftCheckValid = tasks.register("swift-check-valid", Exec) {
+    commandLine "swift"
+    args("-version")
+}
+
 def jextract = tasks.register("jextract", Exec) {
     description = "Builds swift sources, including swift-java source generation"
-    dependsOn compileSwiftJExtractPlugin
+    dependsOn swiftCheckValid
+    // 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"))