diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bb576db..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -2.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index b2e37c2..7093119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,32 @@ Change Log ========== +Version 2.7.13 *(26th April, 2023)* +------------------------------------------- +* Bumped Firebase to version 10.6.0 + + +Version 2.7.12 *(30th November, 2022)* +------------------------------------------- +* Bumped Firebase to version 10.2.0 + +Version 2.7.11 *(24th June, 2022)* +------------------------------------------- +* Bumped Firebase to version 9.6.0 + +Version 2.7.10 *(24th June, 2022)* +------------------------------------------- +* Bumped Firebase to version 9.2+ + +Version 2.7.9 *(21st January, 2022)* +------------------------------------------- +* Fix compilation issue w/ SPM. +* Updated releasing.md to include steps for posting SPM releases. + +Version 2.7.8 *(14th October, 2021)* +------------------------------------------- +* Bumped Firebase to version 8.7+ + Version 2.7.7 *(24th May, 2021)* ------------------------------------------- * Fix incorrect array being used for recursive mapping. diff --git a/Example/Podfile b/Example/Podfile index f79d8d1..cb41af9 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '10.0' +platform :ios, '11.0' use_frameworks! diff --git a/Example/Podfile.lock b/Example/Podfile.lock index ade90bd..7df7b0a 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,104 +1,102 @@ PODS: - - Analytics (4.1.4) + - Analytics (4.1.6) - Expecta (1.0.6) - - Firebase (7.11.0): - - Firebase/Core (= 7.11.0) - - Firebase/Core (7.11.0): + - Firebase (10.6.0): + - Firebase/Core (= 10.6.0) + - Firebase/Core (10.6.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 7.11.0) - - Firebase/CoreOnly (7.11.0): - - FirebaseCore (= 7.11.0) - - FirebaseAnalytics (7.11.0): - - FirebaseAnalytics/AdIdSupport (= 7.11.0) - - FirebaseCore (~> 7.0) - - FirebaseInstallations (~> 7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" - - nanopb (~> 2.30908.0) - - FirebaseAnalytics/AdIdSupport (7.11.0): - - FirebaseAnalytics/Base (= 7.11.0) - - FirebaseCore (~> 7.0) - - FirebaseInstallations (~> 7.0) - - GoogleAppMeasurement/AdIdSupport (= 7.11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" - - nanopb (~> 2.30908.0) - - FirebaseAnalytics/Base (7.11.0): - - FirebaseCore (~> 7.0) - - FirebaseInstallations (~> 7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" - - nanopb (~> 2.30908.0) - - FirebaseCore (7.11.0): - - FirebaseCoreDiagnostics (~> 7.4) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/Logger (~> 7.0) - - FirebaseCoreDiagnostics (7.11.0): - - GoogleDataTransport (~> 8.4) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/Logger (~> 7.0) - - nanopb (~> 2.30908.0) - - FirebaseInstallations (7.11.0): - - FirebaseCore (~> 7.0) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/UserDefaults (~> 7.0) - - PromisesObjC (~> 1.2) - - GoogleAppMeasurement/AdIdSupport (7.11.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" - - nanopb (~> 2.30908.0) - - GoogleDataTransport (8.4.0): - - GoogleUtilities/Environment (~> 7.2) - - nanopb (~> 2.30908.0) - - PromisesObjC (~> 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.4.1): + - 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): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.4.1): - - PromisesObjC (~> 1.2) - - GoogleUtilities/Logger (7.4.1): + - GoogleUtilities/Environment (7.11.0): + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Logger (7.11.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.4.1): + - GoogleUtilities/MethodSwizzler (7.11.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.4.1): + - GoogleUtilities/Network (7.11.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.4.1)" - - GoogleUtilities/Reachability (7.4.1): + - "GoogleUtilities/NSData+zlib (7.11.0)" + - GoogleUtilities/Reachability (7.11.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.4.1): + - GoogleUtilities/UserDefaults (7.11.0): - GoogleUtilities/Logger - - nanopb (2.30908.0): - - nanopb/decode (= 2.30908.0) - - nanopb/encode (= 2.30908.0) - - nanopb/decode (2.30908.0) - - nanopb/encode (2.30908.0) + - 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 (1.2.12) - - Segment-Firebase (2.7.6): + - PromisesObjC (2.2.0) + - Segment-Firebase (2.7.12): - Analytics - - Firebase (~> 7.7) - - Firebase/Core (~> 7.7) - - FirebaseAnalytics (~> 7.7) - - Segment-Firebase/Core (= 2.7.6) - - Segment-Firebase/Core (2.7.6): + - 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): - Analytics - - Firebase (~> 7.7) - - Firebase/Core (~> 7.7) - - FirebaseAnalytics (~> 7.7) - - Specta (1.0.7) + - Firebase (~> 10.6.0) + - Firebase/Core (~> 10.6.0) + - FirebaseAnalytics (~> 10.6.0) + - Specta (2.0.0) DEPENDENCIES: - Expecta @@ -113,10 +111,9 @@ SPEC REPOS: - Firebase - FirebaseAnalytics - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreInternal - FirebaseInstallations - GoogleAppMeasurement - - GoogleDataTransport - GoogleUtilities - nanopb - OCHamcrest @@ -129,23 +126,22 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Analytics: 7bdc735c456434b4eaa2eacdcf122bb03d51ede7 + Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 - Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd - FirebaseAnalytics: cd3bd84d722a24a8923918af8af8e5236f615d77 - FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432 - FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c - FirebaseInstallations: a58d4f72ec5861840b84df489f2668d970df558a - GoogleAppMeasurement: fd19169c3034975cb934e865e5667bfdce59df7f - GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7 - GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20 - nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 + Firebase: f13680471b021937f2230ea8503c7809d8c29806 + FirebaseAnalytics: 9f382605c5ee412b039212f054bf7a403d9850c1 + FirebaseCore: fa80ad16a62d52f67274b5b88304c3a318bbf9a4 + FirebaseCoreInternal: c7cd505e2136811096b225ac388d6254a2622362 + FirebaseInstallations: 13dde135fa0524e15bddb133ccc8465c53a1b3f3 + GoogleAppMeasurement: 686b48c3c895f3c55c70719041913d5d150b74f6 + GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f + nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5 OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b - PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 - Segment-Firebase: 803612e886720f0d7d819871cf279c748ce6e187 - Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef + Segment-Firebase: 51000eb031fd9b990fb79c9a38ad5d73cebd4f9c + Specta: b79d84043684b35ffdc2680df578dc318ec2efc2 -PODFILE CHECKSUM: 6ed9d49cabf18e7f28eb6b1e1c6f84ce781f3324 +PODFILE CHECKSUM: 2c6ff7ca8d5b9826542864d0ab6166c58179de30 -COCOAPODS: 1.10.1 +COCOAPODS: 1.12.0 diff --git a/Example/Segment-Firebase.xcodeproj/project.pbxproj b/Example/Segment-Firebase.xcodeproj/project.pbxproj index f2ce51e..eb586c1 100644 --- a/Example/Segment-Firebase.xcodeproj/project.pbxproj +++ b/Example/Segment-Firebase.xcodeproj/project.pbxproj @@ -306,9 +306,8 @@ "${PODS_ROOT}/Target Support Files/Pods-Segment-Firebase_Example/Pods-Segment-Firebase_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Analytics/Segment.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", - "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", @@ -317,9 +316,8 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Segment.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", diff --git a/Example/Segment-Firebase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/Segment-Firebase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/Segment-Firebase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/Segment-Firebase/Main.storyboard b/Example/Segment-Firebase/Main.storyboard index a64598f..a90f732 100644 --- a/Example/Segment-Firebase/Main.storyboard +++ b/Example/Segment-Firebase/Main.storyboard @@ -1,8 +1,10 @@ - - + + + - + + @@ -14,18 +16,22 @@ - + - - + + + + + @@ -33,4 +39,4 @@ - + \ No newline at end of file diff --git a/Package.resolved b/Package.resolved index ea000db..fc11e75 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", "state": { "branch": null, - "revision": "ff5f5f0a3d3266836b9d722bb73cabdf7057482e", - "version": "0.20200225.3" + "revision": "d302de612e3d57c6f4afaf087da18fba8eac72a7", + "version": "0.20220203.1" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/segmentio/analytics-ios.git", "state": { "branch": null, - "revision": "187faa897c826fe0954124da116db3318242f7c3", - "version": "4.1.4" + "revision": "fc64997865619f73bbab196c164f7845a13da110", + "version": "4.1.6" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", "state": { "branch": null, - "revision": "15889fadef7078dfa1392b0e2b08f3d0e9797104", - "version": "0.7.1" + "revision": "79db6516894a932d0ddaff3b05b9da1e4f6c4069", + "version": "0.9.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", "state": { "branch": null, - "revision": "b97bfcd2e5eecc7aa7e1aeb27d097d610876cf93", - "version": "7.11.1" + "revision": "60f9a33e7084482df67b48e16f315f4f7a6f5da9", + "version": "10.6.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", "state": { "branch": null, - "revision": "22cb3ab5588200b210ae01e42665f52ac4e8ad28", - "version": "7.11.1" + "revision": "04351180d4c757c6c16127cb57b685fff9ef260b", + "version": "10.6.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/google/GoogleDataTransport.git", "state": { "branch": null, - "revision": "369716b8d7518a530ce3c3a251436d72546debd8", - "version": "8.4.0" + "revision": "5056b15c5acbb90cd214fe4d6138bdf5a740e5a8", + "version": "9.2.0" } }, { @@ -60,17 +60,17 @@ "repositoryURL": "https://github.com/google/GoogleUtilities.git", "state": { "branch": null, - "revision": "66f5945ac3a4c4ac268bf94c31f226116b14e327", - "version": "7.4.0" + "revision": "6db6edb48bdd9943426562c7f042a5492de5ba3d", + "version": "7.10.0" } }, { "package": "gRPC", - "repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git", + "repositoryURL": "https://github.com/grpc/grpc-ios.git", "state": { "branch": null, - "revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version": "1.28.4" + "revision": "2af4f6e9c2b18beae228f50b1198c641be859d2b", + "version": "1.44.2-grpc" } }, { @@ -78,8 +78,8 @@ "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", "state": { "branch": null, - "revision": "91ed3d188eb95705fef3c249453b81f32dc557d1", - "version": "1.5.0" + "revision": "efda500b6d9858d38a76dbfbfa396bd644692e4a", + "version": "3.0.0" } }, { @@ -96,8 +96,8 @@ "repositoryURL": "https://github.com/firebase/nanopb.git", "state": { "branch": null, - "revision": "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", - "version": "2.30908.0" + "revision": "819d0a2173aff699fb8c364b6fb906f7cdb1a692", + "version": "2.30909.0" } }, { @@ -105,8 +105,8 @@ "repositoryURL": "https://github.com/google/promises.git", "state": { "branch": null, - "revision": "afa9a1ace74e116848d4f743599ab83e584ff8cb", - "version": "1.2.12" + "revision": "46c1e6b5ac09d8f82c991061c659f67e573d425d", + "version": "2.1.0" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/apple/swift-protobuf.git", "state": { "branch": null, - "revision": "bfe4255ff60f22a41cafa113059668571ed5d461", - "version": "1.16.0" + "revision": "e1499bc69b9040b29184f7f2996f7bab467c1639", + "version": "1.19.0" } } ] diff --git a/Package.swift b/Package.swift index c39d487..203cdb4 100644 --- a/Package.swift +++ b/Package.swift @@ -3,18 +3,18 @@ import PackageDescription let package = Package( name: "SegmentFirebase", - platforms: [.iOS(.v10)], + platforms: [.iOS(.v11)], products: [.library(name: "SegmentFirebase", targets: ["SegmentFirebase"])], dependencies: [ - .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.3"), - .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "7.5.0"), + .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"), ], targets: [ .target( name: "SegmentFirebase", dependencies: [ "Segment", - .product(name: "FirebaseAnalytics", package: "Firebase"), + .product(name: "FirebaseAnalytics", package: "Firebase") ], path: "Segment-Firebase/Classes", publicHeadersPath: "" diff --git a/RELEASING.md b/RELEASING.md index 010c3f3..e94eb14 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -9,4 +9,7 @@ Releasing 6. `pod trunk push Segment-Firebase.podspec --allow-warnings` 7. Update the version `Segment-Firebase.podspec` to the next beta version. 8. `git commit -am "Prepare next development version."` - 9. `git push` \ No newline at end of file + 9. `git push` + 10. Make a new release on the github releases page here: + https://github.com/segment-integrations/analytics-ios-integration-firebase/releases + \ No newline at end of file diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index fe99b08..94c2664 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.7" + s.version = "2.7.13" s.summary = "Firebase Integration for Segment's analytics-ios library." s.description = <<-DESC @@ -16,7 +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.platform = :ios, '10.0' + s.swift_version = '4.0' + s.platform = :ios, '11.0' s.requires_arc = true s.source_files = 'Segment-Firebase/Classes/**/*' @@ -24,9 +25,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 7.7' - s.dependency 'Firebase/Core', '~> 7.7' - s.dependency 'FirebaseAnalytics','~> 7.7' + s.dependency 'Firebase', '~> 10.6.0' + s.dependency 'Firebase/Core', '~> 10.6.0' + s.dependency 'FirebaseAnalytics','~> 10.6.0' s.subspec 'Core' do |core| #For users who only want the core Firebase package diff --git a/Segment-Firebase/Classes/SEGFirebaseIntegration.m b/Segment-Firebase/Classes/SEGFirebaseIntegration.m index 48dd6ca..c8d54b5 100644 --- a/Segment-Firebase/Classes/SEGFirebaseIntegration.m +++ b/Segment-Firebase/Classes/SEGFirebaseIntegration.m @@ -6,7 +6,7 @@ #if defined(__has_include) && __has_include() #import #else -#import +@import Segment; #endif @@ -103,7 +103,6 @@ + (NSString *)formatFirebaseNameString:(NSString *)name NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"([^a-zA-Z0-9_])" options:0 error:&error]; NSString *formatted = [regex stringByReplacingMatchesInString:trimmed options:0 range:NSMakeRange(0, [trimmed length]) withTemplate:@"_"]; - NSLog(@"Output: %@", formatted); return [formatted substringToIndex:MIN(40, [formatted length])]; } @@ -119,10 +118,10 @@ - (NSString *)formatFirebaseEventNames:(NSString *)event kFIREventAddToCart, @"Product Added", kFIREventRemoveFromCart, @"Product Removed", kFIREventBeginCheckout, @"Checkout Started", - kFIREventPresentOffer, @"Promotion Viewed", + kFIREventViewPromotion, @"Promotion Viewed", kFIREventAddPaymentInfo, @"Payment Info Entered", kFIREventPurchase, @"Order Completed", - kFIREventPurchaseRefund, @"Order Refunded", + kFIREventRefund, @"Order Refunded", kFIREventViewItemList, @"Product List Viewed", kFIREventAddToWishlist, @"Product Added to Wishlist", kFIREventShare, @"Product Shared", diff --git a/Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h b/Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h index 3b24e2d..ed0f21a 100644 --- a/Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h +++ b/Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h @@ -3,7 +3,7 @@ #if defined(__has_include) && __has_include() #import #else -#import +@import Segment; #endif