Merge branch 'main' into wip-jextract-plugin

Author: ktoso

Package.swift

@@ -147,7 +147,6 @@ let package = Package(
   dependencies: [
     .package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),
     .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
-    .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.1.0")),
     .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
   ],
   targets: [
@@ -318,7 +317,6 @@ let package = Package(
         .product(name: "SwiftSyntax", package: "swift-syntax"),
         .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
         .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        .product(name: "Collections", package: "swift-collections"),
         "JavaTypes",
       ],
       swiftSettings: [

Samples/JavaKitSampleApp/Sources/JavaKitExample/JavaKitExample.swift

@@ -57,7 +57,7 @@ extension HelloSwift: HelloSwiftNativeMethods {
       print("Hello from the subclass!")
       helloSub.greetMe()
 
-      assert(helloSub.super.value == 2.71828)
+      assert(helloSub.value == 2.71828)
     } else {
       fatalError("Expected subclass here")
     }

Sources/JExtractSwift/ImportedDecls+Printing.swift

@@ -15,7 +15,6 @@
 import Foundation
 import JavaTypes
 import SwiftSyntax
-import OrderedCollections
 
 extension ImportedFunc {
   /// Render a `@{@snippet ... }` comment section that can be put inside a JavaDoc comment
@@ -99,4 +98,4 @@ extension Optional where Wrapped == VariableAccessorKind {
   func renderMethodName(_ decl: ImportedFunc) -> String {
     self?.renderMethodName(decl) ?? decl.baseIdentifier
   }
-}
+}

Sources/JExtractSwift/ImportedDecls.swift

@@ -263,7 +263,7 @@ public struct ImportedVariable: ImportedDecl, CustomStringConvertible {
   /// Usually this will be all the accessors the variable declares,
   /// however if the getter is async or throwing we may not be able to import it
   /// (yet), and therefore would skip it from the supported set.
-  public var supportedAccessorKinds: OrderedSet<VariableAccessorKind> = [.get, .set]
+  public var supportedAccessorKinds: [VariableAccessorKind] = [.get, .set]
 
   /// This is the base identifier for the function, e.g., "init" for an
   /// initializer or "f" for "f(a:b:)".

Sources/Java2Swift/JavaToSwift.swift

@@ -183,7 +183,8 @@ struct JavaToSwift: ParsableCommand {
   ) throws {
     let translator = JavaTranslator(
       swiftModuleName: moduleName,
-      environment: environment
+      environment: environment,
+      translateAsClass: true
     )
 
     // Keep track of all of the Java classes that will have