diff --git a/Cartfile b/Cartfile index dabc0e8..ecfc375 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,3 @@ -github "BranchMetrics/ios-branch-deep-linking" ~> 2.2.0 -github "mparticle/mparticle-apple-sdk" ~> 8.9 \ No newline at end of file + +github "mparticle/mparticle-apple-sdk" ~> 8.9 +github "BranchMetrics/ios-branch-deep-linking" ~> 3.0.1 diff --git a/Examples/Carthage/Branch Example.xcodeproj/project.pbxproj b/Examples/Carthage/Branch Example.xcodeproj/project.pbxproj index 3efbabf..4a97388 100644 --- a/Examples/Carthage/Branch Example.xcodeproj/project.pbxproj +++ b/Examples/Carthage/Branch Example.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -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 = ""; }; @@ -30,9 +49,9 @@ 04266ADC1D1C3CEE00556828 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 04266ADE1D1C3CEE00556828 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 04266AE41D1C3E6600556828 /* Branch Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Branch Example.entitlements"; sourceTree = ""; }; - 0474F190201689430079DCA8 /* Branch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Branch.framework; path = Carthage/Build/iOS/Branch.framework; sourceTree = ""; }; - 0474F192201689470079DCA8 /* mParticle_Apple_SDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mParticle_Apple_SDK.framework; path = Carthage/Build/iOS/mParticle_Apple_SDK.framework; sourceTree = ""; }; - 0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mParticle_BranchMetrics.framework; path = Carthage/Build/iOS/mParticle_BranchMetrics.framework; sourceTree = ""; }; + 0474F190201689430079DCA8 /* BranchSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BranchSDK.xcframework; path = Carthage/Build/BranchSDK.xcframework; sourceTree = ""; }; + 0474F192201689470079DCA8 /* mParticle_Apple_SDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mParticle_Apple_SDK.xcframework; path = Carthage/Build/mParticle_Apple_SDK.xcframework; sourceTree = ""; }; + 0474F1942016894A0079DCA8 /* mParticle_BranchMetrics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mParticle_BranchMetrics.xcframework; path = Carthage/Build/mParticle_BranchMetrics.xcframework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -40,9 +59,9 @@ 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; }; @@ -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 = ""; @@ -111,7 +130,7 @@ 04266AC61D1C3CEE00556828 /* Sources */, 04266AC71D1C3CEE00556828 /* Frameworks */, 04266AC81D1C3CEE00556828 /* Resources */, - 0474F1962016896E0079DCA8 /* ShellScript */, + E73923A12B607F1400ED8AA0 /* Embed Frameworks */, ); buildRules = ( ); @@ -133,7 +152,6 @@ TargetAttributes = { 04266AC91D1C3CEE00556828 = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = DLD43Y3TRP; SystemCapabilities = { com.apple.SafariKeychain = { enabled = 1; @@ -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; @@ -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; @@ -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; diff --git a/Examples/Carthage/Branch Example/Branch Example.entitlements b/Examples/Carthage/Branch Example/Branch Example.entitlements index 0f68744..37c862d 100644 --- a/Examples/Carthage/Branch Example/Branch Example.entitlements +++ b/Examples/Carthage/Branch Example/Branch Example.entitlements @@ -4,8 +4,8 @@ com.apple.developer.associated-domains - applinks:b8be.test-app.link - applinks:b8be-alternate.test-app.link + applinks:bnc.lt + applinks:bnctestbed.app.link diff --git a/Examples/Carthage/Branch Example/Info.plist b/Examples/Carthage/Branch Example/Info.plist index afe4f72..6711c73 100644 --- a/Examples/Carthage/Branch Example/Info.plist +++ b/Examples/Carthage/Branch Example/Info.plist @@ -27,7 +27,7 @@ CFBundleURLSchemes - mpbranchtest + branchtest @@ -56,5 +56,19 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + branch_key + + live + key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB + test + key_test_hdcBLUy1xZ1JD0tKg7qrLcgirFmPPVJc + + branch_universal_link_domains + + bnctestbed.app.link + bnctestbed.test-app.link + bnctestbed-alternate.app.link + bnc.lt + diff --git a/Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj b/Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj index 1ae47df..73a825b 100644 --- a/Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj +++ b/Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj @@ -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", ); @@ -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; @@ -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; diff --git a/Examples/Cocoapods/Branch Example/Branch Example.entitlements b/Examples/Cocoapods/Branch Example/Branch Example.entitlements index 0f68744..37c862d 100644 --- a/Examples/Cocoapods/Branch Example/Branch Example.entitlements +++ b/Examples/Cocoapods/Branch Example/Branch Example.entitlements @@ -4,8 +4,8 @@ com.apple.developer.associated-domains - applinks:b8be.test-app.link - applinks:b8be-alternate.test-app.link + applinks:bnc.lt + applinks:bnctestbed.app.link diff --git a/Examples/Cocoapods/Branch Example/Info.plist b/Examples/Cocoapods/Branch Example/Info.plist index afe4f72..6711c73 100644 --- a/Examples/Cocoapods/Branch Example/Info.plist +++ b/Examples/Cocoapods/Branch Example/Info.plist @@ -27,7 +27,7 @@ CFBundleURLSchemes - mpbranchtest + branchtest @@ -56,5 +56,19 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + branch_key + + live + key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB + test + key_test_hdcBLUy1xZ1JD0tKg7qrLcgirFmPPVJc + + branch_universal_link_domains + + bnctestbed.app.link + bnctestbed.test-app.link + bnctestbed-alternate.app.link + bnc.lt + diff --git a/Examples/Cocoapods/Podfile b/Examples/Cocoapods/Podfile index 96dd014..5d5d85f 100644 --- a/Examples/Cocoapods/Podfile +++ b/Examples/Cocoapods/Podfile @@ -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! diff --git a/Examples/mParticle-Branch-Example/Podfile b/Examples/mParticle-Branch-Example/Podfile index ece158f..bf0ebe7 100644 --- a/Examples/mParticle-Branch-Example/Podfile +++ b/Examples/mParticle-Branch-Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '11.0' +platform :ios, '12.0' use_frameworks! target 'mParticle' do diff --git a/Examples/mParticle-Branch-Example/mParticle.xcodeproj/project.pbxproj b/Examples/mParticle-Branch-Example/mParticle.xcodeproj/project.pbxproj index 909f9fd..4206e50 100644 --- a/Examples/mParticle-Branch-Example/mParticle.xcodeproj/project.pbxproj +++ b/Examples/mParticle-Branch-Example/mParticle.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -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 = ( @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index b0b1524..0000000 --- a/Package.resolved +++ /dev/null @@ -1,25 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "BranchSDK", - "repositoryURL": "https://github.com/BranchMetrics/ios-branch-sdk-spm", - "state": { - "branch": null, - "revision": "7fbe3085821c8e60241a2037098c6eed76fd2798", - "version": "2.2.0" - } - }, - { - "package": "mParticle-Apple-SDK", - "repositoryURL": "https://github.com/mParticle/mparticle-apple-sdk", - "state": { - "branch": null, - "revision": "8ce7ad752ceeb1d9dc6d782d9c4462eb0ac114b9", - "version": "8.13.0" - } - } - ] - }, - "version": 1 -} diff --git a/Package.swift b/Package.swift index 1e14e71..a3261ec 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "mParticle-BranchMetrics", - platforms: [ .iOS(.v11) ], + platforms: [ .iOS(.v12) ], products: [ .library( name: "mParticle-BranchMetrics", @@ -20,7 +20,7 @@ let package = Package( .upToNextMajor(from: "8.9.0")), .package(name: "BranchSDK", url: "https://github.com/BranchMetrics/ios-branch-sdk-spm", - .upToNextMajor(from: "2.2.0")), + .upToNextMajor(from: "3.0.1")), ], targets: [ .target( diff --git a/mParticle-BranchMetrics.podspec b/mParticle-BranchMetrics.podspec index 75a3f6c..3e5c4a2 100755 --- a/mParticle-BranchMetrics.podspec +++ b/mParticle-BranchMetrics.podspec @@ -13,8 +13,8 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/mparticle-integrations/mparticle-apple-integration-branchmetrics.git", :tag => "v" +s.version.to_s } s.social_media_url = "https://twitter.com/mparticle" - s.ios.deployment_target = "11.0" + s.ios.deployment_target = "12.0" s.ios.source_files = 'mParticle-BranchMetrics/*.{h,m,mm}' s.ios.dependency 'mParticle-Apple-SDK/mParticle', '~> 8.9' - s.ios.dependency 'BranchSDK', '~> 2.2.0' + s.ios.dependency 'BranchSDK', '~> 3.0.1' end diff --git a/mParticle-BranchMetrics.xcodeproj/project.pbxproj b/mParticle-BranchMetrics.xcodeproj/project.pbxproj index bce0487..395bd56 100644 --- a/mParticle-BranchMetrics.xcodeproj/project.pbxproj +++ b/mParticle-BranchMetrics.xcodeproj/project.pbxproj @@ -3,15 +3,15 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ DB7E05A61CB819D300967FDF /* MPKitBranchMetrics.h in Headers */ = {isa = PBXBuildFile; fileRef = DB7E05A41CB819D300967FDF /* MPKitBranchMetrics.h */; settings = {ATTRIBUTES = (Public, ); }; }; DB7E05A71CB819D300967FDF /* MPKitBranchMetrics.m in Sources */ = {isa = PBXBuildFile; fileRef = DB7E05A51CB819D300967FDF /* MPKitBranchMetrics.m */; }; DB9401701CB703F2007ABB18 /* mParticle_BranchMetrics.h in Headers */ = {isa = PBXBuildFile; fileRef = DB94016F1CB703F2007ABB18 /* mParticle_BranchMetrics.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DB94017A1CB70C58007ABB18 /* mParticle_Apple_SDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB9401781CB70C58007ABB18 /* mParticle_Apple_SDK.framework */; }; - DBBE32AA1E09CA3C008DDECB /* Branch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBBE32A91E09CA3C008DDECB /* Branch.framework */; }; + DB94017A1CB70C58007ABB18 /* mParticle_Apple_SDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB9401781CB70C58007ABB18 /* mParticle_Apple_SDK.xcframework */; }; + DBBE32AA1E09CA3C008DDECB /* BranchSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBBE32A91E09CA3C008DDECB /* BranchSDK.xcframework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -20,8 +20,8 @@ DB94016C1CB703F2007ABB18 /* mParticle_BranchMetrics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = mParticle_BranchMetrics.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DB94016F1CB703F2007ABB18 /* mParticle_BranchMetrics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mParticle_BranchMetrics.h; sourceTree = ""; }; DB9401711CB703F2007ABB18 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - DB9401781CB70C58007ABB18 /* mParticle_Apple_SDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mParticle_Apple_SDK.framework; path = Carthage/Build/iOS/mParticle_Apple_SDK.framework; sourceTree = ""; }; - DBBE32A91E09CA3C008DDECB /* Branch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Branch.framework; path = Carthage/Build/iOS/Branch.framework; sourceTree = ""; }; + DB9401781CB70C58007ABB18 /* mParticle_Apple_SDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mParticle_Apple_SDK.xcframework; path = Carthage/Build/mParticle_Apple_SDK.xcframework; sourceTree = ""; }; + DBBE32A91E09CA3C008DDECB /* BranchSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BranchSDK.xcframework; path = Carthage/Build/BranchSDK.xcframework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -29,8 +29,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DBBE32AA1E09CA3C008DDECB /* Branch.framework in Frameworks */, - DB94017A1CB70C58007ABB18 /* mParticle_Apple_SDK.framework in Frameworks */, + DBBE32AA1E09CA3C008DDECB /* BranchSDK.xcframework in Frameworks */, + DB94017A1CB70C58007ABB18 /* mParticle_Apple_SDK.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -68,8 +68,8 @@ DBBE32AB1E09CA41008DDECB /* Frameworks */ = { isa = PBXGroup; children = ( - DBBE32A91E09CA3C008DDECB /* Branch.framework */, - DB9401781CB70C58007ABB18 /* mParticle_Apple_SDK.framework */, + DBBE32A91E09CA3C008DDECB /* BranchSDK.xcframework */, + DB9401781CB70C58007ABB18 /* mParticle_Apple_SDK.xcframework */, ); name = Frameworks; sourceTree = ""; @@ -287,14 +287,19 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(PROJECT_DIR)/Carthage/Build/", ); INFOPLIST_FILE = "mParticle-BranchMetrics/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.mparticle.mParticle-BranchMetrics"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; }; name = Debug; @@ -309,12 +314,16 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(PROJECT_DIR)/Carthage/Build/", ); INFOPLIST_FILE = "mParticle-BranchMetrics/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.mparticle.mParticle-BranchMetrics"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; diff --git a/mParticle-BranchMetrics/MPKitBranchMetrics.m b/mParticle-BranchMetrics/MPKitBranchMetrics.m index efe5bd9..13a627b 100644 --- a/mParticle-BranchMetrics/MPKitBranchMetrics.m +++ b/mParticle-BranchMetrics/MPKitBranchMetrics.m @@ -1,5 +1,5 @@ #import "MPKitBranchMetrics.h" -#if defined(__has_include) && __has_include() +#if defined(__has_include) && __has_include() #import #else #import "Branch.h"