Delete the five hand-matched scalar callback externals

Author: colemancda

Sources/ComposeUI/SwiftCallbackSink.swift

@@ -2,10 +2,12 @@
 //  SwiftCallbackSink.swift
 //  ComposeUI
 //
-//  The entire Kotlin→Swift bridge surface. The JNI symbol for each method
-//  derives from THIS signature — the Kotlin `external` declarations in
-//  SwiftCallbackSink.kt must stay exactly in sync, and this class must never
-//  grow per-view methods.
+//  The one remaining hand-matched Kotlin→Swift external: a lazy-row query
+//  returning a materialized `ViewNode` subtree. It can't move to the generated
+//  `BridgeExport` bindings because an exported Swift function can't return a
+//  JavaKit-wrapped type. The JNI symbol derives from THIS signature, so the
+//  Kotlin `external fun itemNode` in SwiftCallbackSink.kt must stay in sync.
+//  The five scalar event callbacks now cross through `BridgeExport`.
 //
 
 import SwiftJava
@@ -17,31 +19,6 @@ open class SwiftCallbackSink: JavaObject {
 @JavaImplementation("com.pureswift.swiftui.SwiftCallbackSink")
 extension SwiftCallbackSink {
 
-    @JavaMethod
-    func invokeVoid(_ id: Int64) {
-        BridgeRuntime.current?.invokeVoid(id)
-    }
-
-    @JavaMethod
-    func invokeBool(_ id: Int64, _ value: Bool) {
-        BridgeRuntime.current?.invokeBool(id, value)
-    }
-
-    @JavaMethod
-    func invokeDouble(_ id: Int64, _ value: Double) {
-        BridgeRuntime.current?.invokeDouble(id, value)
-    }
-
-    @JavaMethod
-    func invokeInt(_ id: Int64, _ value: Int32) {
-        BridgeRuntime.current?.invokeInt(id, Int(value))
-    }
-
-    @JavaMethod
-    func invokeString(_ id: Int64, _ value: String) {
-        BridgeRuntime.current?.invokeString(id, value)
-    }
-
     @JavaMethod
     func itemNode(_ id: Int64, _ index: Int32) -> ViewNodeObject? {
         BridgeRuntime.current?.itemNode(id, Int(index))

composeui/src/jvmShared/kotlin/com/pureswift/swiftui/SwiftCallbackSink.kt

@@ -1,22 +1,12 @@
 package com.pureswift.swiftui
 
-// The entire Kotlin→Swift bridge surface: five externals dispatching event
-// callback ids into the Swift registry. The JNI symbol for each derives from
-// the SWIFT @JavaImplementation signature — these declarations and the Swift
-// counterparts in SwiftCallbackSink.swift must stay exactly in sync, and this
-// class must never grow per-view methods.
-class SwiftCallbackSink : CallbackSink {
-
-    external override fun invokeVoid(id: Long)
-
-    external override fun invokeBool(id: Long, value: Boolean)
-
-    external override fun invokeDouble(id: Long, value: Double)
-
-    external override fun invokeInt(id: Long, value: Int)
-
-    external override fun invokeString(id: Long, value: String)
-
-    // A lazy row query: returns the materialized row subtree, or null.
-    external override fun itemNode(id: Long, index: Int): ViewNode?
+// The one remaining hand-matched Kotlin→Swift external: a lazy-row query that
+// returns a materialized `ViewNode` subtree. jextract can't express it (an
+// exported Swift function can't return a JavaKit-wrapped type), so this stays a
+// hand-written external whose JNI symbol matches the Swift @JavaImplementation
+// in SwiftCallbackSink.swift. The five scalar event callbacks moved to the
+// generated `BridgeExport` bindings — see JextractCallbackSink.
+class SwiftCallbackSink {
+
+    external fun itemNode(id: Long, index: Int): ViewNode?
 }