Skip to content

Commit 3be3db6

Browse files
Merge pull request #213 from segmentio/feat/test-spm-support-core
migrate iOS/macOS to correct SPM structure per Flutter 3.44 docs
2 parents a160ebe + 3b99caf commit 3be3db6

19 files changed

Lines changed: 30 additions & 16 deletions
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
mkdir -p ios/Classes
1+
mkdir -p ios/segment_analytics/Sources/segment_analytics
22
mkdir -p android/main/kotlin
33

44
flutter pub run pigeon \
55
--input pigeon/context.dart \
66
--dart_out lib/native_context.dart \
7-
--experimental_swift_out ios/Classes/Context.swift \
7+
--experimental_swift_out ios/segment_analytics/Sources/segment_analytics/Context.swift \
88
--experimental_kotlin_out android/src/main/kotlin/com/segment/analytics/Context.kt \
99
--java_package "com.segment.flutter"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: This file stores settings for Dart & Flutter DevTools.
2+
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
3+
extensions:

packages/core/ios/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@ Icon?
3535

3636
/Flutter/Generated.xcconfig
3737
/Flutter/ephemeral/
38-
/Flutter/flutter_export_environment.sh
38+
/Flutter/flutter_export_environment.sh
39+
40+
.build/
41+
.swiftpm/

packages/core/ios/segment_analytics.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The hassle-free way to add Segment analytics to your Flutter app.
1313
s.license = { :file => '../LICENSE' }
1414
s.author = { 'Segment' => 'support@segment.com' }
1515
s.source = { :path => '.' }
16-
s.source_files = 'Classes/**/*'
16+
s.source_files = 'segment_analytics/Sources/segment_analytics/**/*.swift'
1717
s.dependency 'Flutter'
1818
s.platform = :ios, '9.0'
1919

packages/core/ios/Package.swift renamed to packages/core/ios/segment_analytics/Package.swift

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@ import PackageDescription
66
let package = Package(
77
name: "segment_analytics",
88
platforms: [
9-
.iOS("12.0"),
9+
.iOS("13.0"),
1010
],
1111
products: [
12-
.library(name: "segment_analytics", targets: ["segment_analytics"]),
12+
.library(name: "segment-analytics", targets: ["segment_analytics"]),
13+
],
14+
dependencies: [
15+
.package(name: "FlutterFramework", path: "../FlutterFramework"),
1316
],
14-
dependencies: [],
1517
targets: [
1618
.target(
1719
name: "segment_analytics",
18-
dependencies: [],
19-
path: "Classes"
20+
dependencies: [
21+
.product(name: "FlutterFramework", package: "FlutterFramework"),
22+
]
2023
),
2124
]
22-
)
25+
)

packages/core/ios/Classes/AnalyticsPlugin.swift renamed to packages/core/ios/segment_analytics/Sources/segment_analytics/AnalyticsPlugin.swift

File renamed without changes.

packages/core/ios/Classes/AppleUtils.swift renamed to packages/core/ios/segment_analytics/Sources/segment_analytics/AppleUtils.swift

File renamed without changes.

packages/core/ios/Classes/Context.swift renamed to packages/core/ios/segment_analytics/Sources/segment_analytics/Context.swift

File renamed without changes.

packages/core/ios/Classes/LinuxUtils.swift renamed to packages/core/ios/segment_analytics/Sources/segment_analytics/LinuxUtils.swift

File renamed without changes.

packages/core/ios/Classes/VendorSystem.swift renamed to packages/core/ios/segment_analytics/Sources/segment_analytics/VendorSystem.swift

File renamed without changes.

0 commit comments

Comments
 (0)