diff --git a/.circleci/config.yml b/.circleci/config.yml index d42472c..3edf388 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build_and_test: macos: - xcode: "12.0" + xcode: "15.4" steps: - checkout - run: xcrun simctl list @@ -11,7 +11,7 @@ jobs: name: Install build dependencies command: | sudo gem install xcpretty - sudo gem install cocoapods -v 1.10.0 + sudo gem install cocoapods -v 1.15.2 - run: name: Fetch Cocoapods specs command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf diff --git a/.gitignore b/.gitignore index 08c4bfa..554b043 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ Carthage # Pods/ .clang-format + +.build/ \ No newline at end of file diff --git a/Example/Podfile b/Example/Podfile index cb41af9..04d1ac5 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '11.0' +platform :ios, '13.0' use_frameworks! diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 7df7b0a..3453994 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,101 +1,109 @@ PODS: - - Analytics (4.1.6) + - Analytics (4.1.8) - Expecta (1.0.6) - - Firebase (10.6.0): - - Firebase/Core (= 10.6.0) - - Firebase/Core (10.6.0): + - Firebase (11.1.0): + - Firebase/Core (= 11.1.0) + - Firebase/Core (11.1.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.6.0) - - Firebase/CoreOnly (10.6.0): - - FirebaseCore (= 10.6.0) - - FirebaseAnalytics (10.6.0): - - FirebaseAnalytics/AdIdSupport (= 10.6.0) - - FirebaseCore (~> 10.0) - - FirebaseInstallations (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/MethodSwizzler (~> 7.8) - - GoogleUtilities/Network (~> 7.8) - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (10.6.0): - - FirebaseCore (~> 10.0) - - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement (= 10.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/MethodSwizzler (~> 7.8) - - GoogleUtilities/Network (~> 7.8) - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (10.6.0): - - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreInternal (10.6.0): - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.6.0): - - FirebaseCore (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/UserDefaults (~> 7.8) - - PromisesObjC (~> 2.1) - - GoogleAppMeasurement (10.6.0): - - GoogleAppMeasurement/AdIdSupport (= 10.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/MethodSwizzler (~> 7.8) - - GoogleUtilities/Network (~> 7.8) - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.6.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/MethodSwizzler (~> 7.8) - - GoogleUtilities/Network (~> 7.8) - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.6.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/MethodSwizzler (~> 7.8) - - GoogleUtilities/Network (~> 7.8) - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleUtilities/AppDelegateSwizzler (7.11.0): + - FirebaseAnalytics (~> 11.1.0) + - Firebase/CoreOnly (11.1.0): + - FirebaseCore (= 11.1.0) + - FirebaseAnalytics (11.1.0): + - FirebaseAnalytics/AdIdSupport (= 11.1.0) + - FirebaseCore (~> 11.0) + - FirebaseInstallations (~> 11.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - FirebaseAnalytics/AdIdSupport (11.1.0): + - FirebaseCore (~> 11.0) + - FirebaseInstallations (~> 11.0) + - GoogleAppMeasurement (= 11.1.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - FirebaseCore (11.1.0): + - FirebaseCoreInternal (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Logger (~> 8.0) + - FirebaseCoreInternal (11.1.0): + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - FirebaseInstallations (11.1.0): + - FirebaseCore (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/UserDefaults (~> 8.0) + - PromisesObjC (~> 2.4) + - GoogleAppMeasurement (11.1.0): + - GoogleAppMeasurement/AdIdSupport (= 11.1.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - GoogleAppMeasurement/AdIdSupport (11.1.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 11.1.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - GoogleAppMeasurement/WithoutAdIdSupport (11.1.0): + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/MethodSwizzler (~> 8.0) + - GoogleUtilities/Network (~> 8.0) + - "GoogleUtilities/NSData+zlib (~> 8.0)" + - nanopb (~> 3.30910.0) + - GoogleUtilities/AppDelegateSwizzler (8.0.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.11.0): - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.11.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (8.0.2): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (8.0.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.11.0): + - GoogleUtilities/Privacy + - GoogleUtilities/MethodSwizzler (8.0.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.11.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Network (8.0.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.11.0)" - - GoogleUtilities/Reachability (7.11.0): + - "GoogleUtilities/NSData+zlib (8.0.2)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (8.0.2) + - GoogleUtilities/Reachability (8.0.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.11.0): + - GoogleUtilities/Privacy + - GoogleUtilities/UserDefaults (8.0.2): - GoogleUtilities/Logger - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) - - OCHamcrest (8.0.0) - - OCMockito (6.0.0): - - OCHamcrest (~> 8.0) - - PromisesObjC (2.2.0) - - Segment-Firebase (2.7.12): + - GoogleUtilities/Privacy + - nanopb (3.30910.0): + - nanopb/decode (= 3.30910.0) + - nanopb/encode (= 3.30910.0) + - nanopb/decode (3.30910.0) + - nanopb/encode (3.30910.0) + - OCHamcrest (9.0.3) + - OCMockito (7.0.2): + - OCHamcrest (~> 9.0) + - PromisesObjC (2.4.0) + - Segment-Firebase (2.7.14): - Analytics - - Firebase (~> 10.6.0) - - Firebase/Core (~> 10.6.0) - - FirebaseAnalytics (~> 10.6.0) - - Segment-Firebase/Core (= 2.7.12) - - Segment-Firebase/Core (2.7.12): + - Firebase (~> 11.1.0) + - Firebase/Core (~> 11.1.0) + - FirebaseAnalytics (~> 11.1.0) + - Segment-Firebase/Core (= 2.7.14) + - Segment-Firebase/Core (2.7.14): - Analytics - - Firebase (~> 10.6.0) - - Firebase/Core (~> 10.6.0) - - FirebaseAnalytics (~> 10.6.0) + - Firebase (~> 11.1.0) + - Firebase/Core (~> 11.1.0) + - FirebaseAnalytics (~> 11.1.0) - Specta (2.0.0) DEPENDENCIES: @@ -126,22 +134,22 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc + Analytics: 9655e0e1c71ea98107cfcb2b14891168acc6c6c9 Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 - Firebase: f13680471b021937f2230ea8503c7809d8c29806 - FirebaseAnalytics: 9f382605c5ee412b039212f054bf7a403d9850c1 - FirebaseCore: fa80ad16a62d52f67274b5b88304c3a318bbf9a4 - FirebaseCoreInternal: c7cd505e2136811096b225ac388d6254a2622362 - FirebaseInstallations: 13dde135fa0524e15bddb133ccc8465c53a1b3f3 - GoogleAppMeasurement: 686b48c3c895f3c55c70719041913d5d150b74f6 - GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5 - OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b - PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef - Segment-Firebase: 51000eb031fd9b990fb79c9a38ad5d73cebd4f9c + Firebase: fdb3bd378401f26a7adfcf446b0a630f8c20c0e8 + FirebaseAnalytics: 9fcdb2e9844174bb405b34cc47092c9b91993d83 + FirebaseCore: 6e2a2782e234b14d48e880ed369ac55cda87fed7 + FirebaseCoreInternal: adefedc9a88dbe393c4884640a73ec9e8e790f8c + FirebaseInstallations: d0a8fea5a6fa91abc661591cf57c0f0d70863e57 + GoogleAppMeasurement: 8bb20efc67c8fc1cff9c42a06c256caf55289bbf + GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d + nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 + OCHamcrest: f8185bd5d90c25317e36856f079e43ef8b84b02d + OCMockito: 6e00e5d888305c3631928e0137853be8877352c1 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + Segment-Firebase: e447a05a4d1c59a128826df037c4414788a05c92 Specta: b79d84043684b35ffdc2680df578dc318ec2efc2 -PODFILE CHECKSUM: 2c6ff7ca8d5b9826542864d0ab6166c58179de30 +PODFILE CHECKSUM: 6cf4dd0f3db20a564a64fa091a6c42d0fc7df1b1 -COCOAPODS: 1.12.0 +COCOAPODS: 1.15.2 diff --git a/Example/Segment-Firebase.xcodeproj/project.pbxproj b/Example/Segment-Firebase.xcodeproj/project.pbxproj index eb586c1..569e45a 100644 --- a/Example/Segment-Firebase.xcodeproj/project.pbxproj +++ b/Example/Segment-Firebase.xcodeproj/project.pbxproj @@ -63,7 +63,7 @@ 7E38A709D770F329150FA3F1 /* Pods-Segment-Firebase_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Firebase_Tests.debug.xcconfig"; path = "Target Support Files/Pods-Segment-Firebase_Tests/Pods-Segment-Firebase_Tests.debug.xcconfig"; sourceTree = ""; }; 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; 9301B7DB964FA80B7500923D /* Pods-Segment-Firebase_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Firebase_Example.debug.xcconfig"; path = "Target Support Files/Pods-Segment-Firebase_Example/Pods-Segment-Firebase_Example.debug.xcconfig"; sourceTree = ""; }; - D7E7ACFD02F7E6AD4828D86C /* Segment-Firebase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "Segment-Firebase.podspec"; path = "../Segment-Firebase.podspec"; sourceTree = ""; }; + D7E7ACFD02F7E6AD4828D86C /* Segment-Firebase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "Segment-Firebase.podspec"; path = "../Segment-Firebase.podspec"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; DC83CD0454DE50F786B80D50 /* Pods-Segment-Firebase_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Firebase_Tests.release.xcconfig"; path = "Target Support Files/Pods-Segment-Firebase_Tests/Pods-Segment-Firebase_Tests.release.xcconfig"; sourceTree = ""; }; E01872888A825206BE6BED4C /* Pods_Segment_Firebase_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Segment_Firebase_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E406BCE490DBD09282372A92 /* Pods_Segment_Firebase_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Segment_Firebase_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -103,7 +103,6 @@ 7E38A709D770F329150FA3F1 /* Pods-Segment-Firebase_Tests.debug.xcconfig */, DC83CD0454DE50F786B80D50 /* Pods-Segment-Firebase_Tests.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -249,7 +248,11 @@ LastUpgradeCheck = 1240; ORGANIZATIONNAME = wcjohnson11; TargetAttributes = { + 6003F589195388D20070C39A = { + DevelopmentTeam = 4VKSL5HV39; + }; 6003F5AD195388D20070C39A = { + DevelopmentTeam = 4VKSL5HV39; TestTargetID = 6003F589195388D20070C39A; }; }; @@ -526,10 +529,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 4VKSL5HV39; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Segment-Firebase/Segment-Firebase-Prefix.pch"; INFOPLIST_FILE = "Segment-Firebase/Segment-Firebase-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$PODS_CONFIGURATION_BUILD_DIR/Analytics\"", @@ -549,10 +554,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 4VKSL5HV39; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Segment-Firebase/Segment-Firebase-Prefix.pch"; INFOPLIST_FILE = "Segment-Firebase/Segment-Firebase-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -565,6 +572,8 @@ baseConfigurationReference = 7E38A709D770F329150FA3F1 /* Pods-Segment-Firebase_Tests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + DEVELOPMENT_TEAM = 4VKSL5HV39; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -589,6 +598,8 @@ baseConfigurationReference = DC83CD0454DE50F786B80D50 /* Pods-Segment-Firebase_Tests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; + DEVELOPMENT_TEAM = 4VKSL5HV39; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", diff --git a/Example/Tests/Tests.m b/Example/Tests/Tests.m index 0dcba7a..76511c5 100644 --- a/Example/Tests/Tests.m +++ b/Example/Tests/Tests.m @@ -384,7 +384,7 @@ integrations:@{}]; [integration track:payload]; - [verify(mockFirebase) logEventWithName:@"present_offer" parameters:@{ + [verify(mockFirebase) logEventWithName:@"view_promotion" parameters:@{ @"item_id" : @"507f1f77bcf86cd799439011", @"item_category" : @"Games", @"item_name" : @"Monopoly 3rd Edition", @@ -425,7 +425,7 @@ integrations:@{}]; [integration track:payload]; - [verify(mockFirebase) logEventWithName:@"purchase_refund" parameters:@{ + [verify(mockFirebase) logEventWithName:@"refund" parameters:@{ @"transaction_id" : @"50314b8e9bcf000000000000" }]; }); diff --git a/Makefile b/Makefile index 382070a..f60c0d9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SDK ?= "iphonesimulator" -DESTINATION ?= "platform=iOS Simulator,name=iPhone 8" +DESTINATION ?= "platform=iOS Simulator,name=iPhone 15 Pro" PROJECT := Segment-Firebase XC_ARGS := -scheme $(PROJECT)-Example -workspace Example/$(PROJECT).xcworkspace -sdk $(SDK) -destination $(DESTINATION) ONLY_ACTIVE_ARCH=NO diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index fc11e75..0000000 --- a/Package.resolved +++ /dev/null @@ -1,124 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "abseil", - "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", - "state": { - "branch": null, - "revision": "d302de612e3d57c6f4afaf087da18fba8eac72a7", - "version": "0.20220203.1" - } - }, - { - "package": "Segment", - "repositoryURL": "https://github.com/segmentio/analytics-ios.git", - "state": { - "branch": null, - "revision": "fc64997865619f73bbab196c164f7845a13da110", - "version": "4.1.6" - } - }, - { - "package": "BoringSSL-GRPC", - "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", - "state": { - "branch": null, - "revision": "79db6516894a932d0ddaff3b05b9da1e4f6c4069", - "version": "0.9.0" - } - }, - { - "package": "Firebase", - "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", - "state": { - "branch": null, - "revision": "60f9a33e7084482df67b48e16f315f4f7a6f5da9", - "version": "10.6.0" - } - }, - { - "package": "GoogleAppMeasurement", - "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", - "state": { - "branch": null, - "revision": "04351180d4c757c6c16127cb57b685fff9ef260b", - "version": "10.6.0" - } - }, - { - "package": "GoogleDataTransport", - "repositoryURL": "https://github.com/google/GoogleDataTransport.git", - "state": { - "branch": null, - "revision": "5056b15c5acbb90cd214fe4d6138bdf5a740e5a8", - "version": "9.2.0" - } - }, - { - "package": "GoogleUtilities", - "repositoryURL": "https://github.com/google/GoogleUtilities.git", - "state": { - "branch": null, - "revision": "6db6edb48bdd9943426562c7f042a5492de5ba3d", - "version": "7.10.0" - } - }, - { - "package": "gRPC", - "repositoryURL": "https://github.com/grpc/grpc-ios.git", - "state": { - "branch": null, - "revision": "2af4f6e9c2b18beae228f50b1198c641be859d2b", - "version": "1.44.2-grpc" - } - }, - { - "package": "GTMSessionFetcher", - "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", - "state": { - "branch": null, - "revision": "efda500b6d9858d38a76dbfbfa396bd644692e4a", - "version": "3.0.0" - } - }, - { - "package": "leveldb", - "repositoryURL": "https://github.com/firebase/leveldb.git", - "state": { - "branch": null, - "revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", - "version": "1.22.2" - } - }, - { - "package": "nanopb", - "repositoryURL": "https://github.com/firebase/nanopb.git", - "state": { - "branch": null, - "revision": "819d0a2173aff699fb8c364b6fb906f7cdb1a692", - "version": "2.30909.0" - } - }, - { - "package": "Promises", - "repositoryURL": "https://github.com/google/promises.git", - "state": { - "branch": null, - "revision": "46c1e6b5ac09d8f82c991061c659f67e573d425d", - "version": "2.1.0" - } - }, - { - "package": "SwiftProtobuf", - "repositoryURL": "https://github.com/apple/swift-protobuf.git", - "state": { - "branch": null, - "revision": "e1499bc69b9040b29184f7f2996f7bab467c1639", - "version": "1.19.0" - } - } - ] - }, - "version": 1 -} diff --git a/Package.swift b/Package.swift index 203cdb4..20efa14 100644 --- a/Package.swift +++ b/Package.swift @@ -3,11 +3,11 @@ import PackageDescription let package = Package( name: "SegmentFirebase", - platforms: [.iOS(.v11)], + platforms: [.iOS(.v13)], products: [.library(name: "SegmentFirebase", targets: ["SegmentFirebase"])], dependencies: [ - .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.6"), - .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.6.0"), + .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.8"), + .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "11.1.0"), ], targets: [ .target( diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index 94c2664..cc11078 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Firebase" - s.version = "2.7.13" + s.version = "2.7.14" s.summary = "Firebase Integration for Segment's analytics-ios library." s.description = <<-DESC @@ -16,8 +16,8 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/segment-integrations/analytics-ios-integration-firebase.git", :tag => s.version.to_s } s.social_media_url = 'https://twitter.com/segment' - s.swift_version = '4.0' - s.platform = :ios, '11.0' + s.swift_version = '5.0' + s.platform = :ios, '13.0' s.requires_arc = true s.source_files = 'Segment-Firebase/Classes/**/*' @@ -25,9 +25,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 10.6.0' - s.dependency 'Firebase/Core', '~> 10.6.0' - s.dependency 'FirebaseAnalytics','~> 10.6.0' + s.dependency 'Firebase', '~> 11.1.0' + s.dependency 'Firebase/Core', '~> 11.1.0' + s.dependency 'FirebaseAnalytics','~> 11.1.0' s.subspec 'Core' do |core| #For users who only want the core Firebase package