Move java.util.Enumeration wrapper into a new module JavaKitCollection

DougGregor · DougGregor · commit f3487f24a571 · 2024-10-17T14:41:12.000-07:00
diff --git a/Makefile b/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
 
diff --git a/Package.swift b/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),
diff --git a/Sources/JavaKitCollection/Java2Swift.config b/Sources/JavaKitCollection/Java2Swift.config
@@ -0,0 +1,5 @@
+{
+  "classes" : {
+    "java.util.Enumeration" : "Enumeration"
+  }
+}
diff --git a/Sources/JavaKitCollection/JavaEnumeration+Sequence.swift b/Sources/JavaKitCollection/JavaEnumeration+Sequence.swift
diff --git a/Sources/JavaKitCollection/generated/Enumeration.swift b/Sources/JavaKitCollection/generated/Enumeration.swift
@@ -1,4 +1,5 @@
 // Auto-generated by Java-to-Swift wrapper generator.
+import JavaKit
 import JavaRuntime
 
 @JavaInterface("java.util.Enumeration")
diff --git a/Sources/JavaKitJar/generated/JarFile.swift b/Sources/JavaKitJar/generated/JarFile.swift
@@ -1,5 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import JavaKit
+import JavaKitCollection
 import JavaRuntime
 
 @JavaClass("java.util.jar.JarFile")
diff --git a/Sources/JavaKitNetwork/generated/URLClassLoader.swift b/Sources/JavaKitNetwork/generated/URLClassLoader.swift
@@ -1,5 +1,6 @@
 // Auto-generated by Java-to-Swift wrapper generator.
 import JavaKit
+import JavaKitCollection
 import JavaRuntime
 
 @JavaClass("java.net.URLClassLoader")

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "classes" : {
 +    "java.util.Enumeration" : "Enumeration"
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// Auto-generated by Java-to-Swift wrapper generator.`
	`2`	`+import JavaKit`
`2`	`3`	`import JavaRuntime`
`3`	`4`
`4`	`5`	`@JavaInterface("java.util.Enumeration")`