diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index b7f32f6..1281416 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -17,11 +17,11 @@ jobs: build_and_test_examples: needs: cancel_previous - runs-on: macos-11 + runs-on: macos-latest steps: - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '13.0' + xcode-version: latest-stable - uses: actions/checkout@v2 - uses: actions/cache@v2 with: diff --git a/Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7380d1e..d155f96 100644 --- a/Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example/BasicExample/BasicExample.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/segmentio/analytics-swift", "state": { "branch": null, - "revision": "af7f1d2fe6e48b1760538739f13f44ba71c1a61c", - "version": "1.3.4" + "revision": "c8fd5fdf59299f00b3e4303a1b12a6d88893bf56", + "version": "1.4.7" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/segmentio/Sovran-Swift.git", "state": { "branch": null, - "revision": "944c17d7c46bd95fc37f09136cabd172be5b413b", - "version": "1.0.3" + "revision": "64f3b5150c282a34af4578188dce2fd597e600e3", + "version": "1.1.0" } }, { diff --git a/Package.resolved b/Package.resolved index e69e7dd..4d57583 100644 --- a/Package.resolved +++ b/Package.resolved @@ -3,11 +3,11 @@ "pins": [ { "package": "abseil", - "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", + "repositoryURL": "https://github.com/google/abseil-cpp-binary.git", "state": { "branch": null, - "revision": "d302de612e3d57c6f4afaf087da18fba8eac72a7", - "version": "0.20220203.1" + "revision": "bfc0b6f81adc06ce5121eb23f628473638d67c5c", + "version": "1.2022062300.0" } }, { @@ -15,17 +15,8 @@ "repositoryURL": "https://github.com/segmentio/analytics-swift.git", "state": { "branch": null, - "revision": "76316a5009502de6e7c2788c295e9afc68793cd3", - "version": "1.1.2" - } - }, - { - "package": "BoringSSL-GRPC", - "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", - "state": { - "branch": null, - "revision": "79db6516894a932d0ddaff3b05b9da1e4f6c4069", - "version": "0.9.0" + "revision": "c8fd5fdf59299f00b3e4303a1b12a6d88893bf56", + "version": "1.4.7" } }, { @@ -33,8 +24,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk", "state": { "branch": null, - "revision": "e8828e8efc813817b3c2cbfde8e965f7a7a26641", - "version": "9.2.0" + "revision": "2bfe6abe1014aafe5cf28401708f7d39f9926a76", + "version": "10.14.0" } }, { @@ -42,8 +33,8 @@ "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", "state": { "branch": null, - "revision": "192cce3e0486aecfdb61102a9c694c78dc89dc48", - "version": "9.1.0" + "revision": "03b9beee1a61f62d32c521e172e192a1663a5e8b", + "version": "10.13.0" } }, { @@ -51,8 +42,8 @@ "repositoryURL": "https://github.com/google/GoogleDataTransport.git", "state": { "branch": null, - "revision": "b905c49326b72211531ed9d7baa02d724828a8dc", - "version": "9.1.4" + "revision": "aae45a320fd0d11811820335b1eabc8753902a40", + "version": "9.2.5" } }, { @@ -60,17 +51,17 @@ "repositoryURL": "https://github.com/google/GoogleUtilities.git", "state": { "branch": null, - "revision": "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f", - "version": "7.7.1" + "revision": "c38ce365d77b04a9a300c31061c5227589e5597b", + "version": "7.11.5" } }, { "package": "gRPC", - "repositoryURL": "https://github.com/grpc/grpc-ios.git", + "repositoryURL": "https://github.com/google/grpc-binary.git", "state": { "branch": null, - "revision": "2af4f6e9c2b18beae228f50b1198c641be859d2b", - "version": "1.44.2-grpc" + "revision": "f1b366129d1125be7db83247e003fc333104b569", + "version": "1.50.2" } }, { @@ -78,8 +69,17 @@ "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", "state": { "branch": null, - "revision": "19605024d59eaefdb1f6a2cb11ebe75df4421126", - "version": "2.0.0" + "revision": "d415594121c9e8a4f9d79cecee0965cf35e74dbd", + "version": "3.1.1" + } + }, + { + "package": "InteropForGoogle", + "repositoryURL": "https://github.com/google/interop-ios-for-google-sdks.git", + "state": { + "branch": null, + "revision": "2d12673670417654f08f5f90fdd62926dc3a2648", + "version": "100.0.0" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/segmentio/Sovran-Swift.git", "state": { "branch": null, - "revision": "944c17d7c46bd95fc37f09136cabd172be5b413b", - "version": "1.0.3" + "revision": "64f3b5150c282a34af4578188dce2fd597e600e3", + "version": "1.1.0" } }, { diff --git a/Package.swift b/Package.swift index ef22981..31847e5 100644 --- a/Package.swift +++ b/Package.swift @@ -6,7 +6,7 @@ import PackageDescription let package = Package( name: "SegmentFirebase", platforms: [ - //.macOS("10.15"), + .macOS("10.15"), .iOS("13.0"), .tvOS("11.0"), .watchOS("7.1") @@ -23,7 +23,7 @@ let package = Package( .package( name: "Segment", url: "https://github.com/segmentio/analytics-swift.git", - from: "1.3.4" + from: "1.4.7" ), .package( name: "Firebase", diff --git a/Sources/SegmentFirebase/FirebaseDestination.swift b/Sources/SegmentFirebase/FirebaseDestination.swift index fc968a1..f6c50b1 100644 --- a/Sources/SegmentFirebase/FirebaseDestination.swift +++ b/Sources/SegmentFirebase/FirebaseDestination.swift @@ -36,6 +36,11 @@ import FirebaseAnalytics An implmentation of the Firebase Analytics device mode destination as a plugin. */ +@objc(SEGFirebaseDestination) + public class ObjCFirebaseDestination: NSObject, ObjCPlugin, ObjCPluginShim { + public func instance() -> EventPlugin { return FirebaseDestination() } + } + public class FirebaseDestination: DestinationPlugin { public let timeline = Timeline() public let type = PluginType.destination