migrate iOS/macOS to correct SPM structure per Flutter 3.44 docs

packages/core/build_pigeon_plugins.sh

@@ -1,9 +1,9 @@
-mkdir -p ios/Classes
+mkdir -p ios/segment_analytics/Sources/segment_analytics
 mkdir -p android/main/kotlin
 
 flutter pub run pigeon \
   --input pigeon/context.dart \
   --dart_out lib/native_context.dart \
-  --experimental_swift_out ios/Classes/Context.swift \
+  --experimental_swift_out ios/segment_analytics/Sources/segment_analytics/Context.swift \
   --experimental_kotlin_out android/src/main/kotlin/com/segment/analytics/Context.kt \
   --java_package "com.segment.flutter"

packages/core/devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

packages/core/ios/.gitignore

@@ -35,4 +35,7 @@ Icon?
 
 /Flutter/Generated.xcconfig
 /Flutter/ephemeral/
-/Flutter/flutter_export_environment.sh
+/Flutter/flutter_export_environment.sh
+
+.build/
+.swiftpm/

packages/core/ios/segment_analytics.podspec

@@ -13,7 +13,7 @@ The hassle-free way to add Segment analytics to your Flutter app.
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Segment' => 'support@segment.com' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
+  s.source_files = 'segment_analytics/Sources/segment_analytics/**/*.swift'
   s.dependency 'Flutter'
   s.platform = :ios, '9.0'
 

packages/core/ios/Package.swift → packages/core/ios/segment_analytics/Package.swift

@@ -6,17 +6,20 @@ import PackageDescription
 let package = Package(
     name: "segment_analytics",
     platforms: [
-        .iOS("12.0"),
+        .iOS("13.0"),
     ],
     products: [
-        .library(name: "segment_analytics", targets: ["segment_analytics"]),
+        .library(name: "segment-analytics", targets: ["segment_analytics"]),
+    ],
+    dependencies: [
+        .package(name: "FlutterFramework", path: "../FlutterFramework"),
     ],
-    dependencies: [],
     targets: [
         .target(
             name: "segment_analytics",
-            dependencies: [],
-            path: "Classes"
+            dependencies: [
+                .product(name: "FlutterFramework", package: "FlutterFramework"),
+            ]
         ),
     ]
-)
+)

packages/core/lib/state.dart

@@ -160,7 +160,7 @@ abstract class PersistedState<T> implements AsyncStateNotifier<T> {
   }
 
   void init(ErrorHandler errorHandler, bool storageJson) {
-    this._errorHandler = errorHandler;
+    _errorHandler = errorHandler;
     addListener((state) {
       if (_persistance != null) {
         _hasUpdated = true;

packages/core/macos/.gitignore

@@ -0,0 +1,2 @@
+.build/
+.swiftpm/

packages/core/macos/segment_analytics.podspec

@@ -14,7 +14,7 @@ Analytics Flutter MacOS plugin.
   s.author           = { 'Christy Haragan' => 'charagan@twilio.com' }
 
   s.source           = { :path => '.' }
-  s.source_files     = 'Classes/**/*'
+  s.source_files     = 'segment_analytics/Sources/segment_analytics/**/*.swift'
   s.dependency 'FlutterMacOS'
 
   s.platform = :osx, '10.11'

packages/core/macos/Package.swift → packages/core/macos/segment_analytics/Package.swift

@@ -9,14 +9,17 @@ let package = Package(
         .macOS("10.14"),
     ],
     products: [
-        .library(name: "segment_analytics", targets: ["segment_analytics"]),
+        .library(name: "segment-analytics", targets: ["segment_analytics"]),
+    ],
+    dependencies: [
+        .package(name: "FlutterFramework", path: "../FlutterFramework"),
     ],
-    dependencies: [],
     targets: [
         .target(
             name: "segment_analytics",
-            dependencies: [],
-            path: "Classes"
+            dependencies: [
+                .product(name: "FlutterFramework", package: "FlutterFramework"),
+            ]
         ),
     ]
 )