Skip to content

Commit

Permalink
Updating Braze SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
lowip committed Nov 12, 2020
1 parent 6fb2a43 commit ece0826
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
13 changes: 3 additions & 10 deletions Appboy-iOS-SDK.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Appboy-iOS-SDK"
s.version = "3.30.0"
s.version = "4.0.0-beta1"
s.summary = "This is the Braze iOS SDK for Mobile Marketing Automation"
s.homepage = "http://www.braze.com"
s.license = { :type => 'Commercial', :text => 'Please refer to https://github.com/Appboy/appboy-ios-sdk/blob/master/LICENSE'}
Expand All @@ -14,21 +14,14 @@ Pod::Spec.new do |s|
s.preserve_paths = 'AppboyKit/**/*.*'
s.default_subspec = 'UI'

s.pod_target_xcconfig = {
'OTHER_LDFLAGS' => '-ObjC',

# Skip this architecture to pass Pod validation since we removed the `arm64` simulator ARCH in order to use lipo later
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
}
# Same reason as above
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
s.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '-ObjC' }

s.subspec 'Core' do |sc|
sc.ios.library = 'z'
sc.frameworks = 'SystemConfiguration', 'QuartzCore', 'CoreText', 'WebKit'
sc.source_files = 'AppboyKit/headers/AppboyKitLibrary/*.h', 'AppboyKit/ABKModalWebViewController.m', 'AppboyKit/ABKNoConnectionLocalization.m', 'AppboyKit/ABKLocationManagerProvider.m'
sc.resource = 'AppboyKit/Appboy.bundle'
sc.vendored_libraries = 'AppboyKit/libAppboyKitLibrary.a'
sc.vendored_framework = 'AppboyKit/AppboyKitLibrary.xcframework'
sc.weak_framework = 'CoreTelephony', 'Social', 'Accounts', 'AdSupport', 'UserNotifications'
end

Expand Down
Binary file modified AppboyKit/Appboy.bundle/Info.plist
Binary file not shown.
2 changes: 1 addition & 1 deletion AppboyKit/headers/AppboyKitLibrary/Appboy.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#import <UserNotifications/UserNotifications.h>

#ifndef APPBOY_SDK_VERSION
#define APPBOY_SDK_VERSION @"3.30.0"
#define APPBOY_SDK_VERSION @"4.0.0-beta1"
#endif

#if !TARGET_OS_TV
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 4.0.0-beta1

**This beta is not compatible with Carthage.**

##### Breaking
- `AppboyKit` is now distributed as an XCFramework when integrating with Cocoapods. Cocoapods 1.10.0+ is required.
- This removes the need for integrators to exclude the `arm64` architecture when building for the simulator. Please undo any of the changes that may have been made when upgrading to [3.27.0](#3270).

## 3.30.0

##### Breaking
Expand Down
13 changes: 6 additions & 7 deletions Example/Stopwatch.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
4EB014FD1A79D31D00E11E41 /* InAppMessageTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 955DE8941741A70700C07A57 /* InAppMessageTestViewController.m */; };
703BF6D4245A2AD9001C1963 /* InAppMessageWithoutAssetZip.html in Resources */ = {isa = PBXBuildFile; fileRef = 703BF6D2245A2AD9001C1963 /* InAppMessageWithoutAssetZip.html */; };
703BF6D5245A2AD9001C1963 /* InAppMessageWithJS.html in Resources */ = {isa = PBXBuildFile; fileRef = 703BF6D3245A2AD9001C1963 /* InAppMessageWithJS.html */; };
70AAB53D2548663C00F64D7C /* StopwatchNotificationContentExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = C1C53EFF1F7D7CA600042AA5 /* StopwatchNotificationContentExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
715339A6C9F8E86F1CFE61B4 /* libPods-tvOS_Stopwatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7198A927FDBA136DD1BAA0 /* libPods-tvOS_Stopwatch.a */; };
7435A384D098710E76548E58 /* libPods-StopwatchNotificationContentExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A07EA9383F93EFF70E1F00B /* libPods-StopwatchNotificationContentExtension.a */; };
7F825DEA205C810100150F07 /* DataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F825DE9205C810100150F07 /* DataViewController.m */; };
Expand Down Expand Up @@ -58,7 +59,6 @@
C1C53F011F7D7CA700042AA5 /* UserNotificationsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E3688B1A1D6BB2DD0032091D /* UserNotificationsUI.framework */; };
C1C53F051F7D7CA700042AA5 /* NotificationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C1C53F041F7D7CA700042AA5 /* NotificationViewController.m */; };
C1C53F081F7D7CA700042AA5 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C1C53F061F7D7CA700042AA5 /* MainInterface.storyboard */; };
C1C53F0C1F7D7CA700042AA5 /* StopwatchNotificationContentExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = C1C53EFF1F7D7CA600042AA5 /* StopwatchNotificationContentExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
D400EBF31CC86A6100550AD8 /* EventsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D400EBF21CC86A6100550AD8 /* EventsViewController.m */; };
D411F3121CD0355200100702 /* CustomTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = D411F3111CD0355200100702 /* CustomTabBarController.m */; };
D4139BEC1CBDA4F200CA3307 /* FeedUIViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D4139BEB1CBDA4F200CA3307 /* FeedUIViewController.m */; };
Expand All @@ -85,7 +85,7 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
C1C53F0A1F7D7CA700042AA5 /* PBXContainerItemProxy */ = {
70AAB53E2548663C00F64D7C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 95EF5102173D5FD600C0D780 /* Project object */;
proxyType = 1;
Expand Down Expand Up @@ -119,7 +119,7 @@
dstSubfolderSpec = 13;
files = (
E33088211D6BB0B4008935A9 /* StopwatchNotificationService.appex in Embed App Extensions */,
C1C53F0C1F7D7CA700042AA5 /* StopwatchNotificationContentExtension.appex in Embed App Extensions */,
70AAB53D2548663C00F64D7C /* StopwatchNotificationContentExtension.appex in Embed App Extensions */,
);
name = "Embed App Extensions";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -344,7 +344,6 @@
A77A349C24E6AE46F1B800EA /* Pods-tvOS_TVML_Stopwatch.develop.xcconfig */,
554E827EA66F0EED2E46DF49 /* Pods-tvOS_TVML_Stopwatch.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -752,7 +751,7 @@
);
dependencies = (
E33088201D6BB0B4008935A9 /* PBXTargetDependency */,
C1C53F0B1F7D7CA700042AA5 /* PBXTargetDependency */,
70AAB53F2548663C00F64D7C /* PBXTargetDependency */,
);
name = Stopwatch;
productName = Stopwatch;
Expand Down Expand Up @@ -1437,10 +1436,10 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
C1C53F0B1F7D7CA700042AA5 /* PBXTargetDependency */ = {
70AAB53F2548663C00F64D7C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C1C53EFE1F7D7CA600042AA5 /* StopwatchNotificationContentExtension */;
targetProxy = C1C53F0A1F7D7CA700042AA5 /* PBXContainerItemProxy */;
targetProxy = 70AAB53E2548663C00F64D7C /* PBXContainerItemProxy */;
};
E33088201D6BB0B4008935A9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
Expand Down
2 changes: 1 addition & 1 deletion Example/Stopwatch/Supporting Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.30.0</string>
<string>4.0.0-beta1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ let package = Package(
targets: [
.binaryTarget(
name: "AppboyKitLibrary",
url: "https://github.com/Appboy/appboy-ios-sdk/releases/download/3.30.0/AppboyKitLibrary.xcframework.zip",
checksum: "2c7d4234b808537434f8632c824b58e1c53819e364852276f720f28cfac77fab"
url: "https://github.com/Appboy/appboy-ios-sdk/releases/download/4.0.0-beta1/AppboyKitLibrary.xcframework.zip",
checksum: "eed3fc80c235510801c6a3a5ee9e282234297fa1850313ebf07444cdfae04717"
),
.target(
name: "AppboyKit",
Expand Down

0 comments on commit ece0826

Please sign in to comment.