Skip to content

fix test and cleanup #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktoso merged 15 commits into from
Dec 4, 2025
Merged

fix test and cleanup #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3fa3d44
Fix `allowGlobalAutomatic` mode for interfaces (#466)
madsodgaard Dec 1, 2025
6eb4705
Improve readme section of Java installation from SDKMan . (#461)
pelekon Dec 1, 2025
8d6365c
jextract (ffm, jni): Subscripts support (#459)
pelekon Dec 1, 2025
c0c6fd5
Use thread environment instead for JNI methods (#465)
madsodgaard Dec 1, 2025
2ed85e2
[jextract] Add async legacy mode (#462)
madsodgaard Dec 1, 2025
eea0638
link log on android (#467)
madsodgaard Dec 1, 2025
67c20f7
Fix JNI caching for native threads (#464)
madsodgaard Dec 1, 2025
3be8df2
jextract: add support for implementing Swift protocols in Java (#449)
madsodgaard Dec 2, 2025
a33d709
test: add tests for @Unsigned in methods in jextract JNI mode (#475)
ktoso Dec 3, 2025
670f640
Move some tests ouf of sample app into tests (#476)
ktoso Dec 3, 2025
7519b4c
extract `CustomStringConvertible` as `toString()` and fix extensions …
madsodgaard Dec 3, 2025
c6a56cd
jextract: fix protocols that return java classes. (#479)
madsodgaard Dec 3, 2025
f45acdf
fix test
madsodgaard Dec 4, 2025
63124a0
Merge branch 'main' into jextract-sub-diretories
madsodgaard Dec 4, 2025
302391e
Revert "Merge branch 'main' into jextract-sub-diretories"
madsodgaard Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ractJNISampleApp/Sources/MySwiftLibrary/LibrarySubDirectory/SwiftTypeInSubDirectory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public final class SwiftTypeInSubDirectory {
public init() {}

public func hello() -> Int {
public func hello() -> Int64 {
12
}
}
2 changes: 0 additions & 2 deletions Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ extension FFMSwift2JavaGenerator {
javaPackagePath: nil,
filename: filename) {
log.info("Done writing Swift thunks to: \(outputFile.absoluteString)")
// log.info("REMOVE FROM: \(expectedOutputSwiftFileNames)")
// log.info("REMOVE FROM THE: \(filename)")
self.expectedOutputSwiftFileNames.remove(filename)
}
} catch {
Expand Down
4 changes: 0 additions & 4 deletions Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ package class FFMSwift2JavaGenerator: Swift2JavaGenerator {
// It is sufficient to use file names only, since SwiftPM requires names to be unique within a module anyway.
if translator.config.writeEmptyFiles ?? false {
self.expectedOutputSwiftFileNames = Set(translator.inputs.compactMap { (input) -> String? in
// guard let filePathPart = input.path.split(separator: "/\(translator.swiftModuleName)/").last else {
// return nil
// }
// return String(filePathPart.replacing(".swift", with: "+SwiftJava.swift"))
guard let fileName = input.path.split(separator: PATH_SEPARATOR).last else {
return nil
}
Expand Down
1 change: 0 additions & 1 deletion Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ extension JNISwift2JavaGenerator {
for expectedFileName in self.expectedOutputSwiftFileNames {
logger.info("Write SwiftPM-'expected' empty file: \(expectedFileName.bold)")


var printer = CodePrinter()
printer.print("// Empty file generated on purpose")
_ = try printer.writeContents(
Expand Down
4 changes: 0 additions & 4 deletions Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ package class JNISwift2JavaGenerator: Swift2JavaGenerator {
// It is sufficient to use file names only, since SwiftPM requires names to be unique within a module anyway.
if translator.config.writeEmptyFiles ?? false {
self.expectedOutputSwiftFileNames = Set(translator.inputs.compactMap { (input) -> String? in
// guard let filePathPart = input.path.split(separator: "/\(translator.swiftModuleName)/").last else {
// return nil
// }
// return String(filePathPart.replacing(".swift", with: "+SwiftJava.swift"))
guard let fileName = input.path.split(separator: PATH_SEPARATOR).last else {
return nil
}
Expand Down
3 changes: 0 additions & 3 deletions Sources/JExtractSwiftLib/Swift2Java.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ public struct SwiftToJava {
log.info("Input paths = \(inputPaths)")

let allFiles = collectAllFiles(suffix: ".swift", in: inputPaths, log: translator.log)
for f in allFiles {
log.warning("INPUT FILE: \(f) ->>>")
}

// Register files to the translator.
let fileManager = FileManager.default
Expand Down