Skip to content

Commit

Permalink
Merge pull request #103 from square/msilvis/bump-deployment-target
Browse files Browse the repository at this point in the history
Bump the min deployment target to 12
  • Loading branch information
MikeSilvis authored Jun 14, 2021
2 parents 0885e76 + 6ae1979 commit e53b538
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -20,7 +20,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
OCMock: 721c11680ae2d65d67f40932777194daf7002781
SquarePointOfSaleSDK: 1f69421c2d46e812cb65a0c6edd3e19aef339740
SquarePointOfSaleSDK: 8bf3f20e30b9426d23a8dc837ba7bd6245da5885

PODFILE CHECKSUM: e781ee37c527dfe47abbeca21610d209a98372ff

Expand Down
6 changes: 1 addition & 5 deletions Sources/SCCAPIConnection.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions SquarePointOfSaleSDK.podspec
Original file line number Diff line number Diff line change
@@ -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}'

Expand All @@ -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

Expand Down

0 comments on commit e53b538

Please sign in to comment.