Skip to content

Commit 0b20fbc

Browse files
committed
lots of fixing around how we deal with config and library loading
1 parent 28e30c0 commit 0b20fbc

File tree

4 files changed

+5
-1
lines changed

4 files changed

+5
-1
lines changed

.github/scripts/validate_samples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ for samplePackage in ${SAMPLE_PACKAGES} ; do
2222
./${CI_VALIDATE_SCRIPT} || exit
2323
elif [[ $(find . -name 'build.gradle*' -maxdepth 1) ]]; then
2424
echo -e "${BOLD}Gradle${RESET} build..."
25-
./gradlew build --info || exit
25+
./gradlew build || ./gradlew build --info # re-run to get better failure output
2626
else
2727
echo -e "${BOLD}SwiftPM${RESET} build..."
2828
swift build || exit

Plugins/JExtractSwiftCommandPlugin/JExtractSwiftCommandPlugin.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ final class JExtractSwiftCommandPlugin: BuildToolPlugin, CommandPlugin {
6060
print("[swift-java-command] error: Failed to extract from target '\(target.name)': \(error)")
6161
}
6262

63+
print("[swift-java-command] Done.")
6364
}
6465
print("[swift-java-command] Generating sources: " + "done".green + ".")
6566
}

Samples/SwiftKitSampleApp/src/main/java/com/example/swift/HelloJava2Swift.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public static void main(String[] args) {
3434

3535
System.out.print("Property: java.library.path = \n");
3636
System.out.println(SwiftKit.getJavaLibraryPath());
37+
System.out.println(" " + path);
38+
}
3739

3840
examples();
3941

buildSrc/src/main/groovy/org/swift/swiftkit/gradle/BuildUtils.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ final class BuildUtils {
4141
]
4242
def releasePaths = debugPaths.collect { it.replaceAll("debug", "release") }
4343
def systemPaths =
44+
// system paths
4445
isLinux ?
4546
[
4647
"/usr/lib/swift/linux",

0 commit comments

Comments
 (0)