diff --git a/Samples/SwiftAndJavaJarSampleLib/src/test/java/com/example/swift/MySwiftClassTest.java b/Samples/SwiftAndJavaJarSampleLib/src/test/java/com/example/swift/MySwiftClassTest.java index a52879bb..fa17ef1a 100644 --- a/Samples/SwiftAndJavaJarSampleLib/src/test/java/com/example/swift/MySwiftClassTest.java +++ b/Samples/SwiftAndJavaJarSampleLib/src/test/java/com/example/swift/MySwiftClassTest.java @@ -45,8 +45,7 @@ void test_MySwiftClass_voidMethod() { MySwiftClass o = new MySwiftClass(12, 42); o.voidMethod(); } catch (Throwable throwable) { - throw throwable; -// checkPaths(throwable); + checkPaths(throwable); } } diff --git a/Samples/SwiftKitSampleApp/src/test/java/org/swift/swiftkit/MySwiftStructTest.java b/Samples/SwiftKitSampleApp/src/test/java/org/swift/swiftkit/MySwiftStructTest.java index fbdbf3a3..b48e28d3 100644 --- a/Samples/SwiftKitSampleApp/src/test/java/org/swift/swiftkit/MySwiftStructTest.java +++ b/Samples/SwiftKitSampleApp/src/test/java/org/swift/swiftkit/MySwiftStructTest.java @@ -9,8 +9,6 @@ // See CONTRIBUTORS.txt for the list of Swift.org project authors // // SPDX-License-Identifier: Apache-2.0 - - // //===----------------------------------------------------------------------===// diff --git a/Sources/JExtractSwift/ImportedDecls.swift b/Sources/JExtractSwift/ImportedDecls.swift index be533916..72204e66 100644 --- a/Sources/JExtractSwift/ImportedDecls.swift +++ b/Sources/JExtractSwift/ImportedDecls.swift @@ -69,6 +69,7 @@ public struct ImportedNominalType: ImportedDecl { } } +// TODO: replace this with `SwiftNominalTypeDeclaration.Kind` public enum NominalTypeKind { case `actor` case `class` diff --git a/Sources/JExtractSwift/Swift2JavaTranslator.swift b/Sources/JExtractSwift/Swift2JavaTranslator.swift index 8b1ffa14..ff81ef16 100644 --- a/Sources/JExtractSwift/Swift2JavaTranslator.swift +++ b/Sources/JExtractSwift/Swift2JavaTranslator.swift @@ -147,9 +147,8 @@ extension Swift2JavaTranslator { "java.lang.invoke.*", "java.util.Arrays", "java.util.stream.Collectors", - "java.nio.charset.StandardCharsets", - "java.util.concurrent.atomic.*", + "java.nio.charset.StandardCharsets", ] } diff --git a/SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueWitnessTable.java b/SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueWitnessTable.java index 589bd72d..4bc86786 100644 --- a/SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueWitnessTable.java +++ b/SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueWitnessTable.java @@ -15,7 +15,7 @@ package org.swift.swiftkit; import java.lang.foreign.*; -import java.lang.invoke.MethodHandle; +import java.lang.invoke.*; import static java.lang.foreign.ValueLayout.JAVA_BYTE; import static org.swift.swiftkit.SwiftKit.getSwiftInt;