Skip to content

Commit 044f190

Browse files
lucdionlucdion
committed
Fix travis-ci build.
1 parent 670ff01 commit 044f190

File tree

11 files changed

+66
-62
lines changed

11 files changed

+66
-62
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode11.5
2+
osx_image: xcode12.2
33

44
cache:
55
- bundler

‎Example/PinLayoutSample.xcodeproj/xcshareddata/xcschemes/PinLayoutSample.xcscheme‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1220"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "249EFE3E1E64FAFE00165E39"
34+
BuildableName = "PinLayoutSample.app"
35+
BlueprintName = "PinLayoutSample"
36+
ReferencedContainer = "container:PinLayoutSample.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "249EFE3E1E64FAFE00165E39"
46-
BuildableName = "PinLayoutSample.app"
47-
BlueprintName = "PinLayoutSample"
48-
ReferencedContainer = "container:PinLayoutSample.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:PinLayoutSample.xcodeproj">
7270
</BuildableReference>
7371
</BuildableProductRunnable>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎PinLayout.podspec‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,13 @@ Pod::Spec.new do |spec|
1717
spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
1818
spec.source_files = "Sources/**/*.swift"
1919
spec.swift_versions = ['4.2', '5.0', '5.1', '5.2', '5.3']
20+
21+
spec.ios.deployment_target = '9.0'
22+
spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
23+
24+
spec.tvos.deployment_target = '9.0'
25+
spec.tvos.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
26+
27+
spec.osx.deployment_target = '10.11'
28+
spec.osx.frameworks = 'Foundation', 'CoreGraphics', 'AppKit'
2029
end

‎PinLayout.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@
13891389
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
13901390
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
13911391
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1392-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1392+
MACOSX_DEPLOYMENT_TARGET = 10.11;
13931393
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.PinLayout-macOS";
13941394
PRODUCT_NAME = PinLayout;
13951395
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1421,7 +1421,7 @@
14211421
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
14221422
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14231423
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1424-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1424+
MACOSX_DEPLOYMENT_TARGET = 10.11;
14251425
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.PinLayout-macOS";
14261426
PRODUCT_NAME = PinLayout;
14271427
PROVISIONING_PROFILE_SPECIFIER = "";

‎Sources/Impl/PinSafeArea.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ struct PinLayoutSwizzling {
158158
if let view = viewController.view {
159159
let safeAreaInsets: UIEdgeInsets
160160

161-
if #available(iOS 11.0, *) {
161+
if #available(iOS 11.0, tvOS 11.0, *) {
162162
safeAreaInsets = UIEdgeInsets(top: viewController.view.safeAreaInsets.top, left: 0,
163163
bottom: viewController.view.safeAreaInsets.bottom, right: 0)
164164
} else {
@@ -201,7 +201,7 @@ extension UIView {
201201
// UIViewController.viewWillLayoutSubviews hasn't been swizzled, we can return an insets
202202
// only if the view is a UIViewController's view.
203203
if let viewController = self.next as? UIViewController {
204-
if #available(iOS 11.0, *) {
204+
if #available(iOS 11.0, tvOS 11.0, *) {
205205
return UIEdgeInsets(top: viewController.view.safeAreaInsets.top, left: 0,
206206
bottom: viewController.view.safeAreaInsets.bottom, right: 0)
207207
} else {

‎TestProjects/cocoapods/ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://github.com/CocoaPods/Specs.git'
2-
platform :ios, '8.0'
2+
platform :ios, '9.0'
33

44
use_frameworks!
55

‎TestProjects/cocoapods/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- PinLayout (1.8.9)
2+
- PinLayout (1.9.3)
33
- SwifterSwift (5.0.0):
44
- SwifterSwift/AppKit (= 5.0.0)
55
- SwifterSwift/CoreGraphics (= 5.0.0)
@@ -33,7 +33,7 @@ EXTERNAL SOURCES:
3333
:path: "../../.."
3434

3535
SPEC CHECKSUMS:
36-
PinLayout: f7237c104696f409470947fee3ac82e239cac367
36+
PinLayout: 74164770108206c3db7aa60c8f87c21132a06f8c
3737
SwifterSwift: 96f90594b370802f01647c2b1229c74a84ffafee
3838

3939
PODFILE CHECKSUM: 0a7937525b5b2e43e75becef489afdd364e0e4ff

‎TestProjects/cocoapods/macos/PinLayout-macOS.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
259259
GCC_WARN_UNUSED_FUNCTION = YES;
260260
GCC_WARN_UNUSED_VARIABLE = YES;
261-
MACOSX_DEPLOYMENT_TARGET = 10.11;
261+
MACOSX_DEPLOYMENT_TARGET = 11.0;
262262
MTL_ENABLE_DEBUG_INFO = YES;
263263
ONLY_ACTIVE_ARCH = YES;
264264
SDKROOT = macosx;
@@ -312,7 +312,7 @@
312312
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
313313
GCC_WARN_UNUSED_FUNCTION = YES;
314314
GCC_WARN_UNUSED_VARIABLE = YES;
315-
MACOSX_DEPLOYMENT_TARGET = 10.11;
315+
MACOSX_DEPLOYMENT_TARGET = 11.0;
316316
MTL_ENABLE_DEBUG_INFO = NO;
317317
SDKROOT = macosx;
318318
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -330,7 +330,7 @@
330330
COMBINE_HIDPI_IMAGES = YES;
331331
INFOPLIST_FILE = "PinLayout-macOS/Info.plist";
332332
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
333-
MACOSX_DEPLOYMENT_TARGET = 10.11;
333+
MACOSX_DEPLOYMENT_TARGET = 11.0;
334334
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-macOS";
335335
PRODUCT_NAME = "$(TARGET_NAME)";
336336
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-macOS/PinLayout-macOS-Bridging-Header.h";
@@ -349,7 +349,7 @@
349349
COMBINE_HIDPI_IMAGES = YES;
350350
INFOPLIST_FILE = "PinLayout-macOS/Info.plist";
351351
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
352-
MACOSX_DEPLOYMENT_TARGET = 10.11;
352+
MACOSX_DEPLOYMENT_TARGET = 11.0;
353353
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-macOS";
354354
PRODUCT_NAME = "$(TARGET_NAME)";
355355
SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-macOS/PinLayout-macOS-Bridging-Header.h";

‎TestProjects/cocoapods/macos/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- PinLayout (1.8.9)
2+
- PinLayout (1.9.3)
33

44
DEPENDENCIES:
55
- PinLayout (from `../../..`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../../.."
1010

1111
SPEC CHECKSUMS:
12-
PinLayout: f7237c104696f409470947fee3ac82e239cac367
12+
PinLayout: 45d8413afa778da892f6c2d4f898fb8de88c8e29
1313

1414
PODFILE CHECKSUM: e4d7a00501eec9097d00e6c5397befb6e16ccaec
1515

‎TestProjects/cocoapods/tvos/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- PinLayout (1.9.1)
2+
- PinLayout (1.9.3)
33

44
DEPENDENCIES:
55
- PinLayout (from `../../..`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../../.."
1010

1111
SPEC CHECKSUMS:
12-
PinLayout: 971dd075938150aee314753269751e0f76dbb851
12+
PinLayout: 45d8413afa778da892f6c2d4f898fb8de88c8e29
1313

1414
PODFILE CHECKSUM: 8c63011727a286dcaaff051ed3b2eedd5363f244
1515

0 commit comments

Comments
 (0)