move to swift as main spm package

Author: denrase

flutter/ios/sentry_flutter/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .macOS("10.13")
     ],
     products: [
-        .library(name: "sentry-flutter", targets: ["sentry_flutter", "sentry_flutter_swift", "sentry_flutter_objc"])
+        .library(name: "sentry-flutter", targets: ["sentry_flutter", "sentry_flutter_objc"])
     ],
     dependencies: [
 //      .package(url: "https://github.com/getsentry/sentry-cocoa", from: "8.36.0")
@@ -19,21 +19,12 @@ let package = Package(
         .target(
             name: "sentry_flutter",
             dependencies: [
-                "sentry_flutter_swift",
-//                .target(name: "Sentry")
-//                .product(name: "Sentry", package: "sentry-cocoa")
-            ],
-            publicHeadersPath:"include"
-        ),
-        // SPM does not support mixed-language, so we need to move the swift files into a separate target
-        .target(
-            name: "sentry_flutter_swift",
-            dependencies: [
-                .target(name: "sentry_flutter_objc"),
+                "sentry_flutter_objc",
                 .target(name: "Sentry")
 //                .product(name: "Sentry", package: "sentry-cocoa")
             ]
         ),
+        // SPM does not support mixed-language targets, so we need to move the ObjC files into a separate one
         .target(
             name: "sentry_flutter_objc",
             dependencies: [

flutter/ios/sentry_flutter/Sources/sentry_flutter_swift/SentryFlutter.swift renamed to flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutter.swift

@@ -17,7 +17,7 @@ import CoreVideo
 // swiftlint:disable file_length function_body_length
 
 // swiftlint:disable:next type_body_length
-public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
+public class SentryFlutterPlugin: NSObject, FlutterPlugin {
     private let channel: FlutterMethodChannel
 
     private static let nativeClientName = "sentry.cocoa.flutter"
@@ -45,7 +45,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
         let channel = FlutterMethodChannel(name: "sentry_flutter", binaryMessenger: registrar.messenger)
 #endif
 
-        let instance = SentryFlutterPluginApple(channel: channel)
+        let instance = SentryFlutterPlugin(channel: channel)
         instance.registerObserver()
         registrar.addMethodCallDelegate(instance, channel: channel)
     }
@@ -306,7 +306,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
             }
 
             let version = PrivateSentrySDKOnly.getSdkVersionString()
-            PrivateSentrySDKOnly.setSdkName(SentryFlutterPluginApple.nativeClientName, andVersionString: version)
+            PrivateSentrySDKOnly.setSdkName(SentryFlutterPlugin.nativeClientName, andVersionString: version)
 
             // note : for now, in sentry-cocoa, beforeSend is not called before captureEnvelope
             options.beforeSend = { event in
@@ -368,7 +368,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
         if isValidSdk(sdk: sdk) {
 
             switch sdk["name"] as? String {
-            case SentryFlutterPluginApple.nativeClientName:
+            case SentryFlutterPlugin.nativeClientName:
                 #if os(OSX)
                     let origin = "mac"
                 #elseif os(watchOS)
@@ -483,7 +483,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
         let isColdStart = appStartMeasurement.type == .cold
 
         let item: [String: Any] = [
-            "pluginRegistrationTime": SentryFlutterPluginApple.pluginRegistrationTime,
+            "pluginRegistrationTime": SentryFlutterPlugin.pluginRegistrationTime,
             "appStartTime": appStartTime,
             "isColdStart": isColdStart,
             "nativeSpanTimes": nativeSpanTimes