Skip to content

Commit 9992890

Browse files
committed
avoid warnings adding not existing hardcoded paths to classpath
1 parent 7f47bcd commit 9992890

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

Samples/JavaDependencySampleApp/Sources/JavaCommonsCSV/swift-java.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"classes" : {
3-
"org.apache.commons.io.FilenameUtils" : "FilenameUtils"
3+
44
},
5-
"classpath" : "\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/org.apache.commons\/commons-csv\/1.12.0\/c77e053d7189bc0857f8d323ab61cb949965fbd1\/commons-csv-1.12.0.jar:\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/commons-io\/commons-io\/2.17.0\/ddcc8433eb019fb48fe25207c0278143f3e1d7e2\/commons-io-2.17.0.jar:\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/commons-codec\/commons-codec\/1.17.1\/973638b7149d333563584137ebf13a691bb60579\/commons-codec-1.17.1.jar:\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/org.apache.commons\/commons-csv\/1.12.0\/c77e053d7189bc0857f8d323ab61cb949965fbd1\/commons-csv-1.12.0.jar:\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/commons-io\/commons-io\/2.17.0\/ddcc8433eb019fb48fe25207c0278143f3e1d7e2\/commons-io-2.17.0.jar:\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/commons-codec\/commons-codec\/1.17.1\/973638b7149d333563584137ebf13a691bb60579\/commons-codec-1.17.1.jar:JavaKit\/build\/classes\/java\/main:..\/..\/JavaKit\/build\/classes\/java\/main",
5+
"classpath" : "\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/org.apache.commons\/commons-csv\/1.12.0\/c77e053d7189bc0857f8d323ab61cb949965fbd1\/commons-csv-1.12.0.jar:\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/commons-io\/commons-io\/2.17.0\/ddcc8433eb019fb48fe25207c0278143f3e1d7e2\/commons-io-2.17.0.jar:\/Users\/ktoso\/.gradle\/caches\/modules-2\/files-2.1\/commons-codec\/commons-codec\/1.17.1\/973638b7149d333563584137ebf13a691bb60579\/commons-codec-1.17.1.jar",
66
"dependencies" : [
77
"org.apache.commons:commons-csv:1.12.0"
88
]

Samples/JavaDependencySampleApp/ci-validate.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ MODULE_NAME="JavaCommonsCSV"
99
MODULE_CONFIG_DIR=$(pwd)/Sources/$MODULE_NAME/
1010

1111
### 1) downloads all the dependencies
12+
echo "Resolve dependencies..."
1213
"$JAVASWIFT" --fetch "$MODULE_CONFIG_DIR/swift-java.config" \
1314
--module-name "$MODULE_NAME" \
1415
--output-directory "$MODULE_CONFIG_DIR"

Sources/Java2Swift/JavaToSwift.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,9 @@ struct JavaToSwift: ParsableCommand {
235235
let classpathBuildJavaKitEntries = [
236236
"JavaKit/build/classes/java/main",
237237
"../../JavaKit/build/classes/java/main",
238-
]
238+
].filter {
239+
FileManager.default.fileExists(atPath: $0)
240+
}
239241
classpathEntries += classpathBuildJavaKitEntries
240242

241243
// Bring up the Java VM.

0 commit comments

Comments
 (0)