From a7a58bf045140ac5d4303e38851993cefb07c53b Mon Sep 17 00:00:00 2001 From: Chava Friedler Date: Thu, 27 Jan 2022 17:36:43 -0500 Subject: [PATCH] Prepare for release 4.5.0 --- CHANGELOG.md | 9 ++++++++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../Package.resolved => Package.resolved | 19 +++++-------------- Package.swift | 2 +- Pod/Classes/SEGAppboyIntegration.m | 3 +++ Segment-Appboy.podspec | 12 ++++++------ Segment_Appboy.json | 2 +- 7 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 CocoaPodsTVOSExample/Segment-Appboy_Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename CocoapodsExample/Segment-Appboy.xcworkspace/xcshareddata/swiftpm/Package.resolved => Package.resolved (52%) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6ec2de..449cc6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 4.5.0 + +**Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version. + +#### Breaking +- Updated to [Braze iOS SDK 4.4.1+](https://github.com/Appboy/appboy-ios-sdk/blob/master/CHANGELOG.md#441). + ## 4.4.0 **Note:** This version does not include Carthage support. We are revisiting our Carthage approach and will reintroduce it in an upcoming version. @@ -65,7 +72,7 @@ And add the functionality to your `AppDelegate.m`: - Note that tvOS support is not available via Swift Package Manager for this release. - To add the package to your project follow these steps: - Select `File > Swift Packages > Add Package Dependency`. - - In the search bar, enter https://github.com/Appboy/segment-ios. + - In the search bar, enter https://github.com/Appboy/appboy-segment-ios. - Select `Full-SDK` or `Core`, depending on your use case. - In your app's target, under `Build Settings > Other Linker Flags`, add the `-ObjC` linker flag. - In the Xcode menu, click `Product > Scheme > Edit Scheme...` diff --git a/CocoaPodsTVOSExample/Segment-Appboy_Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CocoaPodsTVOSExample/Segment-Appboy_Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/CocoaPodsTVOSExample/Segment-Appboy_Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/CocoapodsExample/Segment-Appboy.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Package.resolved similarity index 52% rename from CocoapodsExample/Segment-Appboy.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to Package.resolved index 86ca50b..574b72d 100644 --- a/CocoapodsExample/Segment-Appboy.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Package.resolved @@ -12,20 +12,11 @@ }, { "package": "Appboy_iOS_SDK", - "repositoryURL": "https://github.com/Appboy/appboy-ios-sdk.git", + "repositoryURL": "https://github.com/braze-inc/braze-ios-sdk.git", "state": { "branch": null, - "revision": "4fe37c10288b10340a9862597d5bce7074980ae0", - "version": "4.3.4" - } - }, - { - "package": "Segment-Appboy", - "repositoryURL": "https://github.com/chshapiro/appboy-segment-ios", - "state": { - "branch": "packageRenameSpm", - "revision": "df5f39c15dc85ec650739cf9ffaac3ba1d93a638", - "version": null + "revision": "cb6470044aee9ac2a942a3edb2ea73b7f61f1aae", + "version": "4.4.1" } }, { @@ -33,8 +24,8 @@ "repositoryURL": "https://github.com/SDWebImage/SDWebImage.git", "state": { "branch": null, - "revision": "d6367439527663d2038ca445a3c3c4e4bac40d60", - "version": "5.12.0" + "revision": "0fff0d7505b5306348263ea64fcc561253bbeb21", + "version": "5.12.2" } } ] diff --git a/Package.swift b/Package.swift index 7dbb14a..00e1744 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,7 @@ let package = Package( ], dependencies: [ .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.1"), - .package(name: "Appboy_iOS_SDK", url: "https://github.com/Appboy/appboy-ios-sdk.git", from: "4.3.0"), + .package(name: "Appboy_iOS_SDK", url: "https://github.com/braze-inc/braze-ios-sdk.git", from: "4.4.1"), ], targets: [ .target( diff --git a/Pod/Classes/SEGAppboyIntegration.m b/Pod/Classes/SEGAppboyIntegration.m index 3b45fbb..d9938a3 100644 --- a/Pod/Classes/SEGAppboyIntegration.m +++ b/Pod/Classes/SEGAppboyIntegration.m @@ -79,6 +79,9 @@ - (id)initWithSettings:(NSDictionary *)settings appboyOptions:(NSDictionary *)ap SEGLog(@"[Appboy startWithApiKey:inApplication:withLaunchOptions:withAppboyOptions:]"); }); } +#if !TARGET_OS_TV + [[Appboy sharedInstance] addSdkMetadata:@[ABKSdkMetadataSegment]]; +#endif } if ([Appboy sharedInstance] != nil) { diff --git a/Segment-Appboy.podspec b/Segment-Appboy.podspec index 3845705..119e78b 100644 --- a/Segment-Appboy.podspec +++ b/Segment-Appboy.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Appboy" - s.version = "4.4.0" + s.version = "4.5.0" s.summary = "Braze Integration for Segment's analytics-ios library." s.description = <<-DESC @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.subspec 'Full-SDK' do |default| default.platform = :ios - default.dependency 'Appboy-iOS-SDK', '~>4.3.0' + default.dependency 'Appboy-iOS-SDK', '~>4.4.1' default.source_files = 'Pod/Classes/**/*' end @@ -34,22 +34,22 @@ Pod::Spec.new do |s| end s.subspec 'Core' do |core| - core.dependency 'Appboy-iOS-SDK/Core', '~>4.3.0' + core.dependency 'Appboy-iOS-SDK/Core', '~>4.4.1' core.source_files = 'Pod/Classes/**/*' end s.subspec 'InAppMessage' do |iam| - iam.dependency 'Appboy-iOS-SDK/InAppMessage', '~>4.3.0' + iam.dependency 'Appboy-iOS-SDK/InAppMessage', '~>4.4.1' iam.source_files = 'Pod/Classes/**/*' end s.subspec 'NewsFeed' do |nf| - nf.dependency 'Appboy-iOS-SDK/NewsFeed', '~>4.3.0' + nf.dependency 'Appboy-iOS-SDK/NewsFeed', '~>4.4.1' nf.source_files = 'Pod/Classes/**/*' end s.subspec 'ContentCards' do |cc| - cc.dependency 'Appboy-iOS-SDK/ContentCards', '~>4.3.0' + cc.dependency 'Appboy-iOS-SDK/ContentCards', '~>4.4.1' cc.source_files = 'Pod/Classes/**/*' end diff --git a/Segment_Appboy.json b/Segment_Appboy.json index 9623862..ee4043a 100644 --- a/Segment_Appboy.json +++ b/Segment_Appboy.json @@ -1 +1 @@ -{ "4.4.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.4.0/Segment_Appboy.framework.zip", "4.3.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.3.0/Segment_Appboy.framework.zip", "4.2.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.2.0/Segment_Appboy.framework.zip", "4.0.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.0.0/Segment_Appboy.framework.zip", "3.6.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.6.1/Segment_Appboy.framework.zip", "3.6.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.6.0/Segment_Appboy.framework.zip", "3.5.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.5.0/Segment_Appboy.framework.zip", "3.4.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.4.1/Segment_Appboy.framework.zip", "3.4.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.4.0/Segment_Appboy.framework.zip", "3.3.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.3.0/Segment_Appboy.framework.zip", "3.2.0" : "https://github.com/Appboy/appboy-segment-ios/releases/download/3.2.0/Segment_Appboy.framework.zip"} +{ "4.5.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.5.0/Segment_Appboy.framework.zip", "4.4.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.4.0/Segment_Appboy.framework.zip", "4.3.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.3.0/Segment_Appboy.framework.zip", "4.2.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.2.0/Segment_Appboy.framework.zip", "4.0.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/4.0.0/Segment_Appboy.framework.zip", "3.6.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.6.1/Segment_Appboy.framework.zip", "3.6.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.6.0/Segment_Appboy.framework.zip", "3.5.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.5.0/Segment_Appboy.framework.zip", "3.4.1": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.4.1/Segment_Appboy.framework.zip", "3.4.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.4.0/Segment_Appboy.framework.zip", "3.3.0": "https://github.com/Appboy/appboy-segment-ios/releases/download/3.3.0/Segment_Appboy.framework.zip", "3.2.0" : "https://github.com/Appboy/appboy-segment-ios/releases/download/3.2.0/Segment_Appboy.framework.zip"}