Skip to content

Commit bfb3299

Browse files
committed
Fix travis, change minimal version and open(url function on iOS
1 parent afb6316 commit bfb3299

File tree

4 files changed

+23
-25
lines changed

4 files changed

+23
-25
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
language: objective-c
2-
osx_image: xcode10
2+
osx_image: xcode10.2
33
env:
44
global:
55
- LC_CTYPE=en_US.UTF-8
66
- LANG=en_US.UTF-8
77
- PROJECT=CallbackURLKit.xcodeproj
88
- IOS_FRAMEWORK_SCHEME="CallbackURLKit"
99
- MACOS_FRAMEWORK_SCHEME="CallbackURLKitOSX"
10-
- IOS_SDK=iphonesimulator12.0
10+
- IOS_SDK=iphonesimulator12.2
1111
- MACOS_SDK=macosx10.14
1212
matrix:
13-
- DESTINATION="OS=12.0,name=iPhone 8" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="NO"
13+
- DESTINATION="OS=12.2,name=iPhone 8" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="NO"
1414
- DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" SDK="$MACOS_SDK" RUN_TESTS="NO"
1515
before_install:
1616
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet

CallbackURLKit.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Pod::Spec.new do |s|
1313
s.author = { "phimage" => "[email protected]" }
1414

1515
# ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
16-
s.ios.deployment_target = '9.0'
17-
s.osx.deployment_target = '10.11'
18-
s.tvos.deployment_target = '9.0'
16+
s.ios.deployment_target = '10.0'
17+
s.osx.deployment_target = '10.12'
18+
s.tvos.deployment_target = '10.0'
1919

2020
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
2121
s.source = { :git => "https://github.com/phimage/CallbackURLKit.git", :tag => s.version }

CallbackURLKit.xcodeproj/project.pbxproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@
368368
INFOPLIST_FILE = Xcode/macOS/Info.plist;
369369
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
370370
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
371-
MACOSX_DEPLOYMENT_TARGET = 10.11;
372371
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitOSX;
373372
PRODUCT_NAME = CallbackURLKit;
374373
SDKROOT = macosx;
@@ -390,7 +389,6 @@
390389
INFOPLIST_FILE = Xcode/macOS/Info.plist;
391390
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
392391
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
393-
MACOSX_DEPLOYMENT_TARGET = 10.11;
394392
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitOSX;
395393
PRODUCT_NAME = CallbackURLKit;
396394
SDKROOT = macosx;
@@ -447,8 +445,8 @@
447445
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
448446
GCC_WARN_UNUSED_FUNCTION = YES;
449447
GCC_WARN_UNUSED_VARIABLE = YES;
450-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
451-
MACOSX_DEPLOYMENT_TARGET = 10.10;
448+
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
449+
MACOSX_DEPLOYMENT_TARGET = 10.14;
452450
MTL_ENABLE_DEBUG_INFO = YES;
453451
ONLY_ACTIVE_ARCH = YES;
454452
SDKROOT = iphoneos;
@@ -502,8 +500,8 @@
502500
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
503501
GCC_WARN_UNUSED_FUNCTION = YES;
504502
GCC_WARN_UNUSED_VARIABLE = YES;
505-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
506-
MACOSX_DEPLOYMENT_TARGET = 10.10;
503+
IPHONEOS_DEPLOYMENT_TARGET = 12.2;
504+
MACOSX_DEPLOYMENT_TARGET = 10.14;
507505
MTL_ENABLE_DEBUG_INFO = NO;
508506
SDKROOT = iphoneos;
509507
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Sources/Manager.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -252,22 +252,22 @@ open class Manager {
252252

253253
open func open(url: Foundation.URL) {
254254
#if APP_EXTENSIONS
255-
if let extensionContext = extensionContext {
256-
extensionContext.open(url, completionHandler: extensionContextCompletionHandler)
257-
}
258-
else {
259-
#if os(iOS) || os(tvOS)
260-
UIApplication.shared.openURL(url)
261-
#elseif os(OSX)
262-
NSWorkspace.shared.open(url)
263-
#endif
264-
}
265-
#else
255+
if let extensionContext = extensionContext {
256+
extensionContext.open(url, completionHandler: extensionContextCompletionHandler)
257+
}
258+
else {
266259
#if os(iOS) || os(tvOS)
267-
UIApplication.shared.openURL(url)
260+
UIApplication.shared.open(url)
268261
#elseif os(OSX)
269-
NSWorkspace.shared.open(url)
262+
NSWorkspace.shared.open(url)
270263
#endif
264+
}
265+
#else
266+
#if os(iOS) || os(tvOS)
267+
UIApplication.shared.open(url)
268+
#elseif os(OSX)
269+
NSWorkspace.shared.open(url)
270+
#endif
271271
#endif
272272
}
273273

0 commit comments

Comments
 (0)