fix test and cleanup (#1)

Co-authored-by: pelekon <[email protected]>
Co-authored-by: Konrad `ktoso` Malawski <[email protected]>
Co-authored-by: Bartłomiej Bukowiecki <[email protected]>
Fix `allowGlobalAutomatic` mode for interfaces (swiftlang#466)
Fix JNI caching for native threads (swiftlang#464)
fix extensions (swiftlang#473)
fix protocols that return java classes. (swiftlang#479)

Author: 3 people

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/LibrarySubDirectory/SwiftTypeInSubDirectory.swift

@@ -15,7 +15,7 @@
 public final class SwiftTypeInSubDirectory {
   public init() {}
 
-  public func hello() -> Int {
+  public func hello() -> Int64 {
     12
   }
 }

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -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 {

Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator.swift

@@ -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
         }

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -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(

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator.swift

@@ -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
         }

Sources/JExtractSwiftLib/Swift2Java.swift

@@ -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