From 8a06508f7168677d94f35c6013f8fa0fa953b22d Mon Sep 17 00:00:00 2001 From: echo-branch <43450805+echo-branch@users.noreply.github.com> Date: Wed, 1 Feb 2023 07:30:41 -0800 Subject: [PATCH] Update Branch SDK to 1.45.2 and mParticle SDK to 8.9 (#46) * SDK-1241 update mParticle to iOS SDK 1.45.0. Also increase min version to iOS 11 to keep in line with Xcode 14. * SDK-1241 update to 1.45.1 * Added PR Template * Update to iOS 1.45.2 --------- Co-authored-by: nsingh-branch <88689850+nsingh-branch@users.noreply.github.com> --- .github/PULL_REQUEST_TEMPLATE.md | 29 +++++++++++++++++++ Cartfile | 4 +-- .../Branch Example.xcodeproj/project.pbxproj | 3 ++ Examples/Carthage/Cartfile | 2 +- .../Branch Example.xcodeproj/project.pbxproj | 2 ++ Examples/Cocoapods/Podfile | 2 +- Examples/mParticle-Branch-Example/Podfile | 2 +- .../mParticle.xcodeproj/project.pbxproj | 2 ++ Package.swift | 6 ++-- mParticle-BranchMetrics.podspec | 8 ++--- mParticle-BranchMetrics/MPKitBranchMetrics.m | 2 +- 11 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..d43e2e4 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,29 @@ +## Reference +SDK-XXXX -- . + +## Summary +<!-- Simple summary of what was changed. --> + +## Motivation +<!-- Why are you making this change? If it's for fixing a bug, if possible, please include a code snippet or example project that demonstrates the issue. --> + +## Type Of Change +<!-- Please delete options that are not relevant --> +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) +- [ ] This change requires a documentation update + +## Testing Instructions +<!-- Testing instructions, example code snippets, etc --> + + +<!-- Checklist --> +<!-- My code follows the style guidelines of this project --> +<!-- I have performed a self-review of my code --> +<!-- I have commented my code, particularly in hard-to-understand areas --> +<!-- I have made corresponding changes to the documentation --> +<!-- I have added tests that prove my fix is effective or that my feature works --> +<!-- New and existing unit tests pass locally with my changes --> + +cc @BranchMetrics/saas-sdk-devs for visibility. diff --git a/Cartfile b/Cartfile index 37efebb..da9db86 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "BranchMetrics/ios-branch-deep-linking" ~> 1.43 -github "mparticle/mparticle-apple-sdk" ~> 8.8 +github "BranchMetrics/ios-branch-deep-linking" ~> 1.45 +github "mparticle/mparticle-apple-sdk" ~> 8.9 diff --git a/Examples/Carthage/Branch Example.xcodeproj/project.pbxproj b/Examples/Carthage/Branch Example.xcodeproj/project.pbxproj index 80d8dce..3efbabf 100644 --- a/Examples/Carthage/Branch Example.xcodeproj/project.pbxproj +++ b/Examples/Carthage/Branch Example.xcodeproj/project.pbxproj @@ -147,6 +147,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -322,6 +323,7 @@ "$(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; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -338,6 +340,7 @@ "$(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; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Examples/Carthage/Cartfile b/Examples/Carthage/Cartfile index 35c5ee2..2805cfc 100644 --- a/Examples/Carthage/Cartfile +++ b/Examples/Carthage/Cartfile @@ -1 +1 @@ -github "mparticle-integrations/mparticle-apple-integration-branchmetrics" ~> 7.0 +github "mparticle-integrations/mparticle-apple-integration-branchmetrics" ~> 8.1 diff --git a/Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj b/Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj index 96a7fc8..1ae47df 100644 --- a/Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj +++ b/Examples/Cocoapods/Branch Example.xcodeproj/project.pbxproj @@ -369,6 +369,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "Branch Example/Branch Example.entitlements"; 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_NAME = "$(TARGET_NAME)"; @@ -382,6 +383,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "Branch Example/Branch Example.entitlements"; 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_NAME = "$(TARGET_NAME)"; diff --git a/Examples/Cocoapods/Podfile b/Examples/Cocoapods/Podfile index a47b427..96dd014 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, '9.0' +platform :ios, '11.0' target 'Branch Example' do use_frameworks! diff --git a/Examples/mParticle-Branch-Example/Podfile b/Examples/mParticle-Branch-Example/Podfile index 18aa0e7..ece158f 100644 --- a/Examples/mParticle-Branch-Example/Podfile +++ b/Examples/mParticle-Branch-Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '9.0' +platform :ios, '11.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 be1f68e..1fb7788 100644 --- a/Examples/mParticle-Branch-Example/mParticle.xcodeproj/project.pbxproj +++ b/Examples/mParticle-Branch-Example/mParticle.xcodeproj/project.pbxproj @@ -430,6 +430,7 @@ 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"; PRODUCT_BUNDLE_IDENTIFIER = io.branch.mParticleFortune; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -447,6 +448,7 @@ 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"; PRODUCT_BUNDLE_IDENTIFIER = io.branch.mParticleFortune; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Package.swift b/Package.swift index e057846..9c0ab52 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "mParticle-BranchMetrics", - platforms: [ .iOS(.v9) ], + platforms: [ .iOS(.v11) ], products: [ .library( name: "mParticle-BranchMetrics", @@ -13,10 +13,10 @@ let package = Package( dependencies: [ .package(name: "mParticle-Apple-SDK", url: "https://github.com/mParticle/mparticle-apple-sdk", - .upToNextMajor(from: "8.2.0")), + .upToNextMajor(from: "8.9.0")), .package(name: "Branch", url: "https://github.com/BranchMetrics/ios-branch-sdk-spm", - .upToNextMajor(from: "1.39.4")), + .upToNextMajor(from: "1.45.2")), ], targets: [ .target( diff --git a/mParticle-BranchMetrics.podspec b/mParticle-BranchMetrics.podspec index 69342ed..63678c1 100755 --- a/mParticle-BranchMetrics.podspec +++ b/mParticle-BranchMetrics.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "mParticle-BranchMetrics" - s.version = "8.0.6" + s.version = "8.1.0" s.summary = "BranchMetrics integration for mParticle" s.description = <<-DESC @@ -13,8 +13,8 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/mparticle-integrations/mparticle-apple-integration-branchmetrics.git", :tag => s.version.to_s } s.social_media_url = "https://twitter.com/mparticle" - s.ios.deployment_target = "9.0" + s.ios.deployment_target = "11.0" s.ios.source_files = 'mParticle-BranchMetrics/*.{h,m,mm}' - s.ios.dependency 'mParticle-Apple-SDK/mParticle', '~> 8.8' - s.ios.dependency 'Branch', '~> 1.43' + s.ios.dependency 'mParticle-Apple-SDK/mParticle', '~> 8.9' + s.ios.dependency 'Branch', '~> 1.45' end diff --git a/mParticle-BranchMetrics/MPKitBranchMetrics.m b/mParticle-BranchMetrics/MPKitBranchMetrics.m index ca130d5..586f698 100644 --- a/mParticle-BranchMetrics/MPKitBranchMetrics.m +++ b/mParticle-BranchMetrics/MPKitBranchMetrics.m @@ -20,7 +20,7 @@ @interface MPEvent (Branch) - (MPMessageType) messageType; @end -NSString *const MPKitBranchMetricsVersionNumber = @"8.0.6"; +NSString *const MPKitBranchMetricsVersionNumber = @"8.1.0"; NSString *const ekBMAppKey = @"branchKey"; NSString *const ekBMAForwardScreenViews = @"forwardScreenViews"; NSString *const ekBMAEnableAppleSearchAds = @"enableAppleSearchAds";