Java2Swift: Regenerate generated mappings

DougGregor · DougGregor · commit 819dd275c0d8 · 2024-10-30T16:25:30.000-07:00
No functionality changes here; we're just more consistent about putting
JavaObject in as the extended type.
diff --git a/Sources/JavaKit/generated/JavaCharacter.swift b/Sources/JavaKit/generated/JavaCharacter.swift
@@ -1102,7 +1102,7 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {
   public func of(_ arg0: UInt16) -> JavaCharacter.UnicodeBlock!
 }
 extension JavaCharacter {
-  @JavaClass("java.lang.Character$UnicodeScript")
+  @JavaClass("java.lang.Character$UnicodeScript", extends: JavaObject.self)
   public struct UnicodeScript {
     public enum UnicodeScriptCases: Equatable {
       case COMMON
@@ -2639,7 +2639,7 @@ extension JavaCharacter {
   }
 }
 extension JavaCharacter.UnicodeScript {
-  @JavaClass("java.lang.Enum$EnumDesc")
+  @JavaClass("java.lang.Enum$EnumDesc", extends: JavaObject.self)
   public struct EnumDesc<E: AnyJavaObject> {
   @JavaMethod
   public func toString() -> String
diff --git a/Sources/JavaKitCollection/generated/ArrayDeque.swift b/Sources/JavaKitCollection/generated/ArrayDeque.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.ArrayDeque")
+@JavaClass("java.util.ArrayDeque", extends: JavaObject.self)
 public struct ArrayDeque<E: AnyJavaObject> {
   @JavaMethod
   public init(_ arg0: Int32, environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitCollection/generated/ArrayList.swift b/Sources/JavaKitCollection/generated/ArrayList.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.ArrayList", implements: List<JavaObject>.self, RandomAccess.self)
+@JavaClass("java.util.ArrayList", extends: JavaObject.self, implements: List<JavaObject>.self, RandomAccess.self)
 public struct ArrayList<E: AnyJavaObject> {
   @JavaMethod
   public init(_ arg0: JavaCollection<JavaObject>?, environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitCollection/generated/HashMap.swift b/Sources/JavaKitCollection/generated/HashMap.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.HashMap")
+@JavaClass("java.util.HashMap", extends: JavaObject.self)
 public struct HashMap<K: AnyJavaObject, V: AnyJavaObject> {
   @JavaMethod
   public init(_ arg0: Int32, environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitCollection/generated/HashSet.swift b/Sources/JavaKitCollection/generated/HashSet.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.HashSet", implements: JavaSet<JavaObject>.self)
+@JavaClass("java.util.HashSet", extends: JavaObject.self, implements: JavaSet<JavaObject>.self)
 public struct HashSet<E: AnyJavaObject> {
   @JavaMethod
   public init(_ arg0: Int32, environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitCollection/generated/PriorityQueue.swift b/Sources/JavaKitCollection/generated/PriorityQueue.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.PriorityQueue")
+@JavaClass("java.util.PriorityQueue", extends: JavaObject.self)
 public struct PriorityQueue<E: AnyJavaObject> {
   @JavaMethod
   public init(_ arg0: PriorityQueue<JavaObject>?, environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitCollection/generated/Stack.swift b/Sources/JavaKitCollection/generated/Stack.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.Stack")
+@JavaClass("java.util.Stack", extends: JavaObject.self)
 public struct Stack<E: AnyJavaObject> {
   @JavaMethod
   public init(environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitCollection/generated/TreeMap.swift b/Sources/JavaKitCollection/generated/TreeMap.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.TreeMap")
+@JavaClass("java.util.TreeMap", extends: JavaObject.self)
 public struct TreeMap<K: AnyJavaObject, V: AnyJavaObject> {
   @JavaMethod
   public init(environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitCollection/generated/TreeSet.swift b/Sources/JavaKitCollection/generated/TreeSet.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.TreeSet")
+@JavaClass("java.util.TreeSet", extends: JavaObject.self)
 public struct TreeSet<E: AnyJavaObject> {
   @JavaMethod
   public init(_ arg0: JavaCollection<JavaObject>?, environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitJar/generated/JarEntry.swift b/Sources/JavaKitJar/generated/JarEntry.swift
@@ -2,7 +2,7 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.jar.JarEntry")
+@JavaClass("java.util.jar.JarEntry", extends: JavaObject.self)
 public struct JarEntry {
   @JavaMethod
   public init(_ arg0: JarEntry?, environment: JNIEnvironment? = nil)
diff --git a/Sources/JavaKitJar/generated/JarFile.swift b/Sources/JavaKitJar/generated/JarFile.swift
@@ -3,7 +3,7 @@ import JavaKit
 import JavaKitCollection
 import JavaRuntime
 
-@JavaClass("java.util.jar.JarFile")
+@JavaClass("java.util.jar.JarFile", extends: JavaObject.self)
 public struct JarFile {
   @JavaMethod
   public init(_ arg0: String, _ arg1: Bool, environment: JNIEnvironment? = nil) throws
diff --git a/Sources/JavaKitJar/generated/JarInputStream.swift b/Sources/JavaKitJar/generated/JarInputStream.swift
@@ -2,16 +2,19 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.jar.JarInputStream")
+@JavaClass("java.util.jar.JarInputStream", extends: JavaObject.self)
 public struct JarInputStream {
+  @JavaMethod
+  public func getNextJarEntry() throws -> JarEntry!
+
   @JavaMethod
   public func read(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> Int32
 
   @JavaMethod
   public func getManifest() -> Manifest!
 
   @JavaMethod
-  public func getNextJarEntry() throws -> JarEntry!
+  public func closeEntry() throws
 
   @JavaMethod
   public func read() throws -> Int32
@@ -23,10 +26,10 @@ public struct JarInputStream {
   public func readAllBytes() throws -> [Int8]
 
   @JavaMethod
-  public func readNBytes(_ arg0: Int32) throws -> [Int8]
+  public func readNBytes(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> Int32
 
   @JavaMethod
-  public func readNBytes(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> Int32
+  public func readNBytes(_ arg0: Int32) throws -> [Int8]
 
   @JavaMethod
   public func skip(_ arg0: Int64) throws -> Int64
@@ -37,9 +40,6 @@ public struct JarInputStream {
   @JavaMethod
   public func skipNBytes(_ arg0: Int64) throws
 
-  @JavaMethod
-  public func closeEntry() throws
-
   @JavaMethod
   public func reset() throws
 
diff --git a/Sources/JavaKitJar/generated/JarOutputStream.swift b/Sources/JavaKitJar/generated/JarOutputStream.swift
@@ -2,8 +2,11 @@
 import JavaKit
 import JavaRuntime
 
-@JavaClass("java.util.jar.JarOutputStream")
+@JavaClass("java.util.jar.JarOutputStream", extends: JavaObject.self)
 public struct JarOutputStream {
+  @JavaMethod
+  public func closeEntry() throws
+
   @JavaMethod
   public func write(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws
 
@@ -22,9 +25,6 @@ public struct JarOutputStream {
   @JavaMethod
   public func setLevel(_ arg0: Int32)
 
-  @JavaMethod
-  public func closeEntry() throws
-
   @JavaMethod
   public func flush() throws
 
diff --git a/Sources/JavaKitNetwork/generated/URLClassLoader.swift b/Sources/JavaKitNetwork/generated/URLClassLoader.swift
@@ -3,7 +3,7 @@ import JavaKit
 import JavaKitCollection
 import JavaRuntime
 
-@JavaClass("java.net.URLClassLoader")
+@JavaClass("java.net.URLClassLoader", extends: JavaObject.self)
 public struct URLClassLoader {
   @JavaMethod
   public init(_ arg0: [URL?], environment: JNIEnvironment? = nil)

Original file line number	Diff line number	Diff line change
`@@ -1102,7 +1102,7 @@ extension JavaClass<JavaCharacter.UnicodeBlock> {`
`1102`	`1102`	`public func of(_ arg0: UInt16) -> JavaCharacter.UnicodeBlock!`
`1103`	`1103`	`}`
`1104`	`1104`	`extension JavaCharacter {`
`1105`		`- @JavaClass("java.lang.Character$UnicodeScript")`
	`1105`	`+ @JavaClass("java.lang.Character$UnicodeScript", extends: JavaObject.self)`
`1106`	`1106`	`public struct UnicodeScript {`
`1107`	`1107`	`public enum UnicodeScriptCases: Equatable {`
`1108`	`1108`	`case COMMON`
`@@ -2639,7 +2639,7 @@ extension JavaCharacter {`
`2639`	`2639`	`}`
`2640`	`2640`	`}`
`2641`	`2641`	`extension JavaCharacter.UnicodeScript {`
`2642`		`- @JavaClass("java.lang.Enum$EnumDesc")`
	`2642`	`+ @JavaClass("java.lang.Enum$EnumDesc", extends: JavaObject.self)`
`2643`	`2643`	`public struct EnumDesc<E: AnyJavaObject> {`
`2644`	`2644`	`@JavaMethod`
`2645`	`2645`	`public func toString() -> String`