Merge pull request #90 from DougGregor/javakitcollection

JavaKitCollection module

Author: DougGregor

.gitignore

@@ -27,6 +27,3 @@ Package.resolved
 
 # Cache of project
 .gradletasknamecache
-
-# Ignore generated sources
-**/generated/

.licenseignore

@@ -33,15 +33,7 @@ Makefile
 **/*.html
 **/CMakeLists.txt
 **/*.jar
+**/generated/*.swift
 gradle/wrapper/gradle-wrapper.properties
 gradlew
 gradlew.bat
-**/*.swift2java
-Sources/JavaKit/generated/*
-Sources/JavaKitJar/generated/*
-Sources/JavaKitNetwork/generated/*
-Sources/JavaKitReflection/generated/*
-Sources/_Subprocess/*
-Sources/_Subprocess/**/*
-Sources/_SubprocessCShims/*
-Sources/_SubprocessCShims/**/*

Makefile

@@ -72,17 +72,21 @@ generate-JavaKit: Java2Swift
 	mkdir -p Sources/JavaKit/generated
 	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKit -o Sources/JavaKit/generated Sources/JavaKit/Java2Swift.config
 
-generate-JavaKitReflection: Java2Swift generate-JavaKit
+generate-JavaKitCollection: Java2Swift
+	mkdir -p Sources/JavaKitCollection/generated
+	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitCollection  --depends-on JavaKit=Sources/JavaKit/Java2Swift.config -o Sources/JavaKitCollection/generated Sources/JavaKitCollection/Java2Swift.config
+
+generate-JavaKitReflection: Java2Swift generate-JavaKit generate-JavaKitCollection
 	mkdir -p Sources/JavaKitReflection/generated
-	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitReflection --depends-on JavaKit=Sources/JavaKit/Java2Swift.config -o Sources/JavaKitReflection/generated Sources/JavaKitReflection/Java2Swift.config
+	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitReflection --depends-on JavaKit=Sources/JavaKit/Java2Swift.config --depends-on JavaKitCollection=Sources/JavaKitCollection/Java2Swift.config -o Sources/JavaKitReflection/generated Sources/JavaKitReflection/Java2Swift.config
 
-generate-JavaKitJar: Java2Swift generate-JavaKit
+generate-JavaKitJar: Java2Swift generate-JavaKit generate-JavaKitCollection
 	mkdir -p Sources/JavaKitJar/generated
-	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitJar --depends-on JavaKit=Sources/JavaKit/Java2Swift.config -o Sources/JavaKitJar/generated Sources/JavaKitJar/Java2Swift.config
+	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitJar --depends-on JavaKit=Sources/JavaKit/Java2Swift.config --depends-on JavaKitCollection=Sources/JavaKitCollection/Java2Swift.config -o Sources/JavaKitJar/generated Sources/JavaKitJar/Java2Swift.config
 
-generate-JavaKitNetwork: Java2Swift generate-JavaKit
+generate-JavaKitNetwork: Java2Swift generate-JavaKit generate-JavaKitCollection
 	mkdir -p Sources/JavaKitNetwork/generated
-	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitNetwork --depends-on JavaKit=Sources/JavaKit/Java2Swift.config -o Sources/JavaKitNetwork/generated Sources/JavaKitNetwork/Java2Swift.config
+	$(BUILD_DIR)/debug/Java2Swift --module-name JavaKitNetwork --depends-on JavaKit=Sources/JavaKit/Java2Swift.config --depends-on JavaKitCollection=Sources/JavaKitCollection/Java2Swift.config -o Sources/JavaKitNetwork/generated Sources/JavaKitNetwork/Java2Swift.config
 
 javakit-generate: generate-JavaKit generate-JavaKitReflection generate-JavaKitJar generate-JavaKitNetwork
 

Package.swift

@@ -57,6 +57,11 @@ let package = Package(
       targets: ["JavaRuntime"]
     ),
 
+    .library(
+      name: "JavaKitCollection",
+      targets: ["JavaKitCollection"]
+    ),
+
     .library(
       name: "JavaKitJar",
       targets: ["JavaKitReflection"]
@@ -163,17 +168,26 @@ let package = Package(
       ]
     ),
     .target(
-      name: "JavaKitJar",
+      name: "JavaKitCollection",
       dependencies: ["JavaKit"],
       exclude: ["Java2Swift.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
+    .target(
+      name: "JavaKitJar",
+      dependencies: ["JavaKit", "JavaKitCollection"],
+      exclude: ["Java2Swift.config"],
+      swiftSettings: [
+        .swiftLanguageMode(.v5),
+        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
+      ]
+    ),
     .target(
       name: "JavaKitNetwork",
-      dependencies: ["JavaKit"],
+      dependencies: ["JavaKit", "JavaKitCollection"],
       exclude: ["Java2Swift.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),
@@ -182,7 +196,7 @@ let package = Package(
     ),
     .target(
       name: "JavaKitReflection",
-      dependencies: ["JavaKit"],
+      dependencies: ["JavaKit", "JavaKitCollection"],
       exclude: ["Java2Swift.config"],
       swiftSettings: [
         .swiftLanguageMode(.v5),

Sources/JavaKit/BridgedValues/JavaValue+Array.swift

@@ -93,7 +93,7 @@ extension Array: JavaValue where Element: JavaValue {
   public static func jniNewArray(in environment: JNIEnvironment) -> JNINewArray {
     return { environment, size in
       // FIXME: We should have a bridged JavaArray that we can use here.
-      let arrayClass = environment.interface.FindClass(environment, "java.lang.Array")
+      let arrayClass = environment.interface.FindClass(environment, "java/lang/Array")
       return environment.interface.NewObjectArray(environment, size, arrayClass, nil)
     }
   }

Sources/JavaKit/BridgedValues/JavaValue+String.swift

@@ -64,7 +64,7 @@ extension String: JavaValue {
   public static func jniNewArray(in environment: JNIEnvironment) -> JNINewArray {
     return { environment, size in
       // FIXME: Introduce a JavaString class that we can use for this.
-      let stringClass = environment.interface.FindClass(environment, "java.lang.String")
+      let stringClass = environment.interface.FindClass(environment, "java/lang/String")
       return environment.interface.NewObjectArray(environment, size, stringClass, nil)
     }
   }

Sources/JavaKit/Java2Swift.config

@@ -4,7 +4,6 @@
     "java.lang.Exception" : "Exception",
     "java.lang.Object" : "JavaObject",
     "java.lang.RuntimeException" : "RuntimeException",
-    "java.lang.Throwable" : "Throwable",
-    "java.util.Enumeration" : "Enumeration"
+    "java.lang.Throwable" : "Throwable"
   }
 }

Sources/JavaKitCollection/Java2Swift.config

@@ -0,0 +1,22 @@
+{
+  "classes" : {
+    "java.util.Collection" : "JavaCollection",
+    "java.util.Enumeration" : "Enumeration",
+    "java.util.Iterator" : "JavaIterator",
+    "java.util.List" : "List",
+    "java.util.ListIterator" : "ListIterator",
+    "java.util.Queue" : "Queue",
+    "java.util.RandomAccess" : "RandomAccess",
+    "java.util.Set" : "JavaSet",
+    "java.util.ArrayDeque" : "ArrayDeque",
+    "java.util.ArrayList" : "ArrayList",
+    "java.util.BitSet" : "BitSet",
+    "java.util.Dictionary" : "JavaDictionary",
+    "java.util.HashMap" : "HashMap",
+    "java.util.HashSet" : "HashSet",
+    "java.util.PriorityQueue" : "PriorityQueue",
+    "java.util.Stack" : "Stack",
+    "java.util.TreeMap" : "TreeMap",
+    "java.util.TreeSet" : "TreeSet"
+  }
+}

Sources/JavaKit/JavaEnumeration+Sequence.swift renamed to Sources/JavaKitCollection/JavaEnumeration+Sequence.swift

@@ -0,0 +1,27 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+import JavaKit
+
+extension JavaIterator: IteratorProtocol {
+  public typealias Element = E
+
+  public func next() -> E? {
+    if hasNext() {
+      let nextResult: JavaObject? = next()
+      return nextResult.map { $0.as(E.self)! }
+    }
+
+    return nil
+  }
+}