Skip to content

Commit fbc4699

Browse files
authored
Fix macos version discrepancy (#16)
* Fix macos version discrepancy * Added objc support * Bumped analytics-swift dependency to latest. * Updated CI versions
1 parent f5480b7 commit fbc4699

File tree

5 files changed

+42
-37
lines changed

5 files changed

+42
-37
lines changed

.github/workflows/swift.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717

1818
build_and_test_examples:
1919
needs: cancel_previous
20-
runs-on: macos-11
20+
runs-on: macos-latest
2121
steps:
2222
- uses: maxim-lobanov/setup-xcode@v1
2323
with:
24-
xcode-version: '13.0'
24+
xcode-version: latest-stable
2525
- uses: actions/checkout@v2
2626
- uses: actions/cache@v2
2727
with:

Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.resolved

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import PackageDescription
66
let package = Package(
77
name: "SegmentFirebase",
88
platforms: [
9-
//.macOS("10.15"),
9+
.macOS("10.15"),
1010
.iOS("13.0"),
1111
.tvOS("11.0"),
1212
.watchOS("7.1")
@@ -23,7 +23,7 @@ let package = Package(
2323
.package(
2424
name: "Segment",
2525
url: "https://github.com/segmentio/analytics-swift.git",
26-
from: "1.3.4"
26+
from: "1.4.7"
2727
),
2828
.package(
2929
name: "Firebase",

Sources/SegmentFirebase/FirebaseDestination.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ import FirebaseAnalytics
3636
An implmentation of the Firebase Analytics device mode destination as a plugin.
3737
*/
3838

39+
@objc(SEGFirebaseDestination)
40+
public class ObjCFirebaseDestination: NSObject, ObjCPlugin, ObjCPluginShim {
41+
public func instance() -> EventPlugin { return FirebaseDestination() }
42+
}
43+
3944
public class FirebaseDestination: DestinationPlugin {
4045
public let timeline = Timeline()
4146
public let type = PluginType.destination

0 commit comments

Comments
 (0)