Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update iOS SDK version to 3.x #57

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
github "BranchMetrics/ios-branch-deep-linking" ~> 2.2.0
github "mparticle/mparticle-apple-sdk" ~> 8.9

github "mparticle/mparticle-apple-sdk" ~> 8.9
github "BranchMetrics/ios-branch-deep-linking" ~> 3.0.1
90 changes: 47 additions & 43 deletions Examples/Carthage/Branch Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -13,11 +13,30 @@
04266AD81D1C3CEE00556828 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 04266AD61D1C3CEE00556828 /* Main.storyboard */; };
04266ADA1D1C3CEE00556828 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 04266AD91D1C3CEE00556828 /* Assets.xcassets */; };
04266ADD1D1C3CEE00556828 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 04266ADB1D1C3CEE00556828 /* LaunchScreen.storyboard */; };
0474F191201689440079DCA8 /* Branch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F190201689430079DCA8 /* Branch.framework */; };
0474F193201689470079DCA8 /* mParticle_Apple_SDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F192201689470079DCA8 /* mParticle_Apple_SDK.framework */; };
0474F1952016894A0079DCA8 /* mParticle_BranchMetrics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.framework */; };
E739239F2B607F1400ED8AA0 /* BranchSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F190201689430079DCA8 /* BranchSDK.xcframework */; };
E73923A02B607F1400ED8AA0 /* BranchSDK.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F190201689430079DCA8 /* BranchSDK.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
E73923A22B607F1800ED8AA0 /* mParticle_Apple_SDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F192201689470079DCA8 /* mParticle_Apple_SDK.xcframework */; };
E73923A32B607F1800ED8AA0 /* mParticle_Apple_SDK.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F192201689470079DCA8 /* mParticle_Apple_SDK.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
E73923A42B607F1A00ED8AA0 /* mParticle_BranchMetrics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.xcframework */; };
E73923A52B607F1A00ED8AA0 /* mParticle_BranchMetrics.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
E73923A12B607F1400ED8AA0 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
E73923A52B607F1A00ED8AA0 /* mParticle_BranchMetrics.xcframework in Embed Frameworks */,
E73923A02B607F1400ED8AA0 /* BranchSDK.xcframework in Embed Frameworks */,
E73923A32B607F1800ED8AA0 /* mParticle_Apple_SDK.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
04266ACA1D1C3CEE00556828 /* Branch Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Branch Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
04266ACE1D1C3CEE00556828 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand All @@ -30,19 +49,19 @@
04266ADC1D1C3CEE00556828 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
04266ADE1D1C3CEE00556828 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
04266AE41D1C3E6600556828 /* Branch Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Branch Example.entitlements"; sourceTree = "<group>"; };
0474F190201689430079DCA8 /* Branch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Branch.framework; path = Carthage/Build/iOS/Branch.framework; sourceTree = "<group>"; };
0474F192201689470079DCA8 /* mParticle_Apple_SDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mParticle_Apple_SDK.framework; path = Carthage/Build/iOS/mParticle_Apple_SDK.framework; sourceTree = "<group>"; };
0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mParticle_BranchMetrics.framework; path = Carthage/Build/iOS/mParticle_BranchMetrics.framework; sourceTree = "<group>"; };
0474F190201689430079DCA8 /* BranchSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BranchSDK.xcframework; path = Carthage/Build/BranchSDK.xcframework; sourceTree = "<group>"; };
0474F192201689470079DCA8 /* mParticle_Apple_SDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mParticle_Apple_SDK.xcframework; path = Carthage/Build/mParticle_Apple_SDK.xcframework; sourceTree = "<group>"; };
0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mParticle_BranchMetrics.xcframework; path = Carthage/Build/mParticle_BranchMetrics.xcframework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
04266AC71D1C3CEE00556828 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0474F193201689470079DCA8 /* mParticle_Apple_SDK.framework in Frameworks */,
0474F191201689440079DCA8 /* Branch.framework in Frameworks */,
0474F1952016894A0079DCA8 /* mParticle_BranchMetrics.framework in Frameworks */,
E73923A42B607F1A00ED8AA0 /* mParticle_BranchMetrics.xcframework in Frameworks */,
E73923A22B607F1800ED8AA0 /* mParticle_Apple_SDK.xcframework in Frameworks */,
E739239F2B607F1400ED8AA0 /* BranchSDK.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -94,9 +113,9 @@
0474F18F201689430079DCA8 /* Frameworks */ = {
isa = PBXGroup;
children = (
0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.framework */,
0474F192201689470079DCA8 /* mParticle_Apple_SDK.framework */,
0474F190201689430079DCA8 /* Branch.framework */,
0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.xcframework */,
0474F192201689470079DCA8 /* mParticle_Apple_SDK.xcframework */,
0474F190201689430079DCA8 /* BranchSDK.xcframework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -111,7 +130,7 @@
04266AC61D1C3CEE00556828 /* Sources */,
04266AC71D1C3CEE00556828 /* Frameworks */,
04266AC81D1C3CEE00556828 /* Resources */,
0474F1962016896E0079DCA8 /* ShellScript */,
E73923A12B607F1400ED8AA0 /* Embed Frameworks */,
);
buildRules = (
);
Expand All @@ -133,7 +152,6 @@
TargetAttributes = {
04266AC91D1C3CEE00556828 = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = DLD43Y3TRP;
SystemCapabilities = {
com.apple.SafariKeychain = {
enabled = 1;
Expand Down Expand Up @@ -174,28 +192,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
0474F1962016896E0079DCA8 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/Carthage/Build/iOS/Branch.framework",
"$(SRCROOT)/Carthage/Build/iOS/mParticle_Apple_SDK.framework",
"$(SRCROOT)/Carthage/Build/iOS/mParticle_BranchMetrics.framework",
);
outputPaths = (
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Branch.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/mParticle_Apple_SDK.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/mParticle_BranchMetrics.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
04266AC61D1C3CEE00556828 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -318,14 +314,18 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Branch Example/Branch Example.entitlements";
DEVELOPMENT_TEAM = R63EM248DP;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "Branch Example/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mparticle.branchtesterapp;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
Expand All @@ -335,14 +335,18 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Branch Example/Branch Example.entitlements";
DEVELOPMENT_TEAM = R63EM248DP;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = "Branch Example/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mparticle.branchtesterapp;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions Examples/Carthage/Branch Example/Branch Example.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<dict>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:b8be.test-app.link</string>
<string>applinks:b8be-alternate.test-app.link</string>
<string>applinks:bnc.lt</string>
<string>applinks:bnctestbed.app.link</string>
</array>
</dict>
</plist>
16 changes: 15 additions & 1 deletion Examples/Carthage/Branch Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<string></string>
<key>CFBundleURLSchemes</key>
<array>
<string>mpbranchtest</string>
<string>branchtest</string>
</array>
</dict>
</array>
Expand Down Expand Up @@ -56,5 +56,19 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>branch_key</key>
<dict>
<key>live</key>
<string>key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB</string>
<key>test</key>
<string>key_test_hdcBLUy1xZ1JD0tKg7qrLcgirFmPPVJc</string>
</dict>
<key>branch_universal_link_domains</key>
<array>
<string>bnctestbed.app.link</string>
<string>bnctestbed.test-app.link</string>
<string>bnctestbed-alternate.app.link</string>
<string>bnc.lt</string>
</array>
</dict>
</plist>
8 changes: 4 additions & 4 deletions Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,13 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Branch Example/Pods-Branch Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Branch/Branch.framework",
"${BUILT_PRODUCTS_DIR}/BranchSDK/BranchSDK.framework",
"${BUILT_PRODUCTS_DIR}/mParticle-Apple-SDK/mParticle_Apple_SDK.framework",
"${BUILT_PRODUCTS_DIR}/mParticle-BranchMetrics/mParticle_BranchMetrics.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Branch.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BranchSDK.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/mParticle_Apple_SDK.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/mParticle_BranchMetrics.framework",
);
Expand Down Expand Up @@ -371,7 +371,7 @@
INFOPLIST_FILE = "Branch Example/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mparticle.branchtesterapp;
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
Expand All @@ -385,7 +385,7 @@
INFOPLIST_FILE = "Branch Example/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mparticle.branchtesterapp;
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions Examples/Cocoapods/Branch Example/Branch Example.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<dict>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:b8be.test-app.link</string>
<string>applinks:b8be-alternate.test-app.link</string>
<string>applinks:bnc.lt</string>
<string>applinks:bnctestbed.app.link</string>
</array>
</dict>
</plist>
16 changes: 15 additions & 1 deletion Examples/Cocoapods/Branch Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<string></string>
<key>CFBundleURLSchemes</key>
<array>
<string>mpbranchtest</string>
<string>branchtest</string>
</array>
</dict>
</array>
Expand Down Expand Up @@ -56,5 +56,19 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>branch_key</key>
<dict>
<key>live</key>
<string>key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB</string>
<key>test</key>
<string>key_test_hdcBLUy1xZ1JD0tKg7qrLcgirFmPPVJc</string>
</dict>
<key>branch_universal_link_domains</key>
<array>
<string>bnctestbed.app.link</string>
<string>bnctestbed.test-app.link</string>
<string>bnctestbed-alternate.app.link</string>
<string>bnc.lt</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Examples/Cocoapods/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '11.0'
platform :ios, '12.0'

target 'Branch Example' do
use_frameworks!
Expand Down
2 changes: 1 addition & 1 deletion Examples/mParticle-Branch-Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '11.0'
platform :ios, '12.0'
use_frameworks!

target 'mParticle' do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 48;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -191,7 +191,7 @@
};
};
buildConfigurationList = 4D8B77561F8442D100EFD3FF /* Build configuration list for PBXProject "mParticle" */;
compatibilityVersion = "Xcode 8.0";
compatibilityVersion = "Xcode 15.0";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Expand Down Expand Up @@ -249,17 +249,12 @@
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-mParticle/Pods-mParticle-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/BranchSDK/BranchSDK.framework",
"${BUILT_PRODUCTS_DIR}/mParticle-Apple-SDK/mParticle_Apple_SDK.framework",
"${BUILT_PRODUCTS_DIR}/mParticle-BranchMetrics/mParticle_BranchMetrics.framework",
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-mParticle/Pods-mParticle-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BranchSDK.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/mParticle_Apple_SDK.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/mParticle_BranchMetrics.framework",
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-mParticle/Pods-mParticle-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -416,7 +411,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -430,8 +426,11 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = R63EM248DP;
INFOPLIST_FILE = mParticle/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = io.branch.mParticleFortune;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
Expand All @@ -448,8 +447,11 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = R63EM248DP;
INFOPLIST_FILE = mParticle/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = io.branch.mParticleFortune;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
Expand Down
Loading
Loading