From 6ae1979ca11e975df9a81ca5470312daa078da7c Mon Sep 17 00:00:00 2001 From: Mike Silvis Date: Mon, 14 Jun 2021 12:55:23 -0400 Subject: [PATCH] Bump the min deployment target to 12 --- .travis.yml | 6 ++++-- Podfile.lock | 8 ++++---- Sources/SCCAPIConnection.m | 6 +----- SquarePointOfSaleSDK.podspec | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 429e1e5..0915d81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ language: objective-c -osx_image: xcode11.2.1 -rvm: 2.4.4 +osx_image: xcode12.1 +rvm: 2.6.1 xcode_project: SquarePointOfSaleSDK.xcworkspace xcode_scheme: SquarePointOfSaleSDK-Unit-Tests xcode_destination: platform=iOS Simulator,OS=13.2,name=iPad Pro (9.7-inch) +before_install: + - gem install cocoapods -v '0.32.1' before_script: - bundle install - bundle exec pod gen diff --git a/Podfile.lock b/Podfile.lock index a65830a..a3d7cd5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,8 +1,8 @@ PODS: - OCMock (3.1) - - SquarePointOfSaleSDK (3.5.0) - - SquarePointOfSaleSDK/SampleApp (3.5.0) - - SquarePointOfSaleSDK/Tests (3.5.0): + - SquarePointOfSaleSDK (3.5.1) + - SquarePointOfSaleSDK/SampleApp (3.5.1) + - SquarePointOfSaleSDK/Tests (3.5.1): - OCMock (= 3.1) DEPENDENCIES: @@ -20,7 +20,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: OCMock: 721c11680ae2d65d67f40932777194daf7002781 - SquarePointOfSaleSDK: 1f69421c2d46e812cb65a0c6edd3e19aef339740 + SquarePointOfSaleSDK: 8bf3f20e30b9426d23a8dc837ba7bd6245da5885 PODFILE CHECKSUM: e781ee37c527dfe47abbeca21610d209a98372ff diff --git a/Sources/SCCAPIConnection.m b/Sources/SCCAPIConnection.m index 5f897f4..e5961a9 100644 --- a/Sources/SCCAPIConnection.m +++ b/Sources/SCCAPIConnection.m @@ -86,11 +86,7 @@ + (BOOL)_performRequestWithURL:(nonnull NSURL *)URL error:(out NSError *__nullab return NO; } - if (@available(iOS 10, *)) { - [[UIApplication sharedApplication] openURL:URL options:@{} completionHandler:nil]; - } else { - return [[UIApplication sharedApplication] openURL:URL]; - } + [[UIApplication sharedApplication] openURL:URL options:@{} completionHandler:nil]; return YES; } diff --git a/SquarePointOfSaleSDK.podspec b/SquarePointOfSaleSDK.podspec index 4ef5b6f..964de97 100644 --- a/SquarePointOfSaleSDK.podspec +++ b/SquarePointOfSaleSDK.podspec @@ -1,13 +1,13 @@ Pod::Spec.new do |s| s.name = 'SquarePointOfSaleSDK' - s.version = '3.5.0' + s.version = '3.5.1' s.summary = 'SDK for easier use of Square\'s Point of Sale app-switching API on iOS' s.homepage = 'https://github.com/square/SquarePointOfSaleSDK-iOS/' s.license = { :type => 'Apache License, Version 2.0', :text => "© #{ Date.today.year } Square, Inc." } s.authors = 'Square' s.source = { :git => 'https://github.com/square/SquarePointOfSaleSDK-iOS.git', :tag => s.version } - s.ios.deployment_target = '9.0' + s.ios.deployment_target = '12.0' s.source_files = 'Sources/**/*.{h,m}' @@ -16,7 +16,7 @@ Pod::Spec.new do |s| ] s.test_spec 'Tests' do |test_spec| - test_spec.source_files = 'Tests/**/*.{h,m}' + test_spec.source_files = 'Tests/**/*.{h,m}' test_spec.dependency 'OCMock', '= 3.1' end