Skip to content

Commit ce929a6

Browse files
lucdionlucdion
authored
Merge pull request #267 from layoutBox/update_dependencies
Update dependencies + fix min deployment target to iOS 12
2 parents 312f7a9 + ef7491e commit ce929a6

File tree

23 files changed

+145
-116
lines changed

23 files changed

+145
-116
lines changed

Diff for: ‎Example/PinLayoutSample.xcodeproj/project.pbxproj

+20-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 48;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -528,7 +528,7 @@
528528
isa = PBXProject;
529529
attributes = {
530530
LastSwiftUpdateCheck = 0900;
531-
LastUpgradeCheck = 1300;
531+
LastUpgradeCheck = 1420;
532532
ORGANIZATIONNAME = layoutbox;
533533
TargetAttributes = {
534534
249EFE3E1E64FAFE00165E39 = {
@@ -622,6 +622,7 @@
622622
/* Begin PBXShellScriptBuildPhase section */
623623
24E6547E1E68F88D00A72A8B /* Run Swiftlint */ = {
624624
isa = PBXShellScriptBuildPhase;
625+
alwaysOutOfDate = 1;
625626
buildActionMask = 2147483647;
626627
files = (
627628
);
@@ -632,7 +633,7 @@
632633
);
633634
runOnlyForDeploymentPostprocessing = 0;
634635
shellPath = /bin/sh;
635-
shellScript = ../Pods/SwiftLint/swiftlint;
636+
shellScript = "../Pods/SwiftLint/swiftlint\n";
636637
};
637638
A57F7C48B21998F5C851B138 /* [CP] Embed Pods Frameworks */ = {
638639
isa = PBXShellScriptBuildPhase;
@@ -798,7 +799,7 @@
798799
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
799800
GCC_WARN_UNUSED_FUNCTION = YES;
800801
GCC_WARN_UNUSED_VARIABLE = YES;
801-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
802+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
802803
MTL_ENABLE_DEBUG_INFO = YES;
803804
ONLY_ACTIVE_ARCH = YES;
804805
SDKROOT = iphoneos;
@@ -853,10 +854,11 @@
853854
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
854855
GCC_WARN_UNUSED_FUNCTION = YES;
855856
GCC_WARN_UNUSED_VARIABLE = YES;
856-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
857+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
857858
MTL_ENABLE_DEBUG_INFO = NO;
858859
SDKROOT = iphoneos;
859-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
860+
SWIFT_COMPILATION_MODE = wholemodule;
861+
SWIFT_OPTIMIZATION_LEVEL = "-O";
860862
SWIFT_VERSION = 5.0;
861863
TARGETED_DEVICE_FAMILY = "1,2";
862864
VALIDATE_PRODUCT = YES;
@@ -867,36 +869,42 @@
867869
isa = XCBuildConfiguration;
868870
baseConfigurationReference = A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */;
869871
buildSettings = {
870-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
871872
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
872873
CODE_SIGN_IDENTITY = "iPhone Developer";
873874
DEVELOPMENT_TEAM = "";
874875
INFOPLIST_FILE = "PinLayoutSample/Supporting Files/Info.plist";
875-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
876+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
877+
LD_RUNPATH_SEARCH_PATHS = (
878+
"$(inherited)",
879+
"@executable_path/Frameworks",
880+
);
876881
PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.PinLayoutSample;
877882
PRODUCT_NAME = "$(TARGET_NAME)";
878883
SWIFT_OBJC_BRIDGING_HEADER = "PinLayoutSample/UI/Examples/PinLayoutSample-Bridging-Header.h";
879884
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
880885
SWIFT_VERSION = 5.0;
881-
TVOS_DEPLOYMENT_TARGET = 9.0;
886+
TVOS_DEPLOYMENT_TARGET = 12.0;
882887
};
883888
name = Debug;
884889
};
885890
249EFE691E64FAFE00165E39 /* Release */ = {
886891
isa = XCBuildConfiguration;
887892
baseConfigurationReference = C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */;
888893
buildSettings = {
889-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
890894
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
891895
CODE_SIGN_IDENTITY = "iPhone Developer";
892896
DEVELOPMENT_TEAM = "";
893897
INFOPLIST_FILE = "PinLayoutSample/Supporting Files/Info.plist";
894-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
898+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
899+
LD_RUNPATH_SEARCH_PATHS = (
900+
"$(inherited)",
901+
"@executable_path/Frameworks",
902+
);
895903
PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.PinLayoutSample;
896904
PRODUCT_NAME = "$(TARGET_NAME)";
897905
SWIFT_OBJC_BRIDGING_HEADER = "PinLayoutSample/UI/Examples/PinLayoutSample-Bridging-Header.h";
898906
SWIFT_VERSION = 5.0;
899-
TVOS_DEPLOYMENT_TARGET = 9.0;
907+
TVOS_DEPLOYMENT_TARGET = 12.0;
900908
};
901909
name = Release;
902910
};

Diff for: ‎Example/PinLayoutSample.xcodeproj/xcshareddata/xcschemes/PinLayoutSample.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1420"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Diff for: ‎Example/PinLayoutSample/UI/Examples/CollectionViewExample/CollectionViewExampleView.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ class CollectionViewExampleView: UIView {
3434
if #available(iOS 11.0, tvOS 11.0, *) {
3535
flowLayout.sectionInsetReference = .fromSafeArea
3636
}
37-
37+
38+
collectionView.contentInsetAdjustmentBehavior = .never
3839
collectionView.backgroundColor = .white
3940
collectionView.dataSource = self
4041
collectionView.delegate = self

Diff for: ‎Example/PinLayoutSample/UI/Examples/CollectionViewExample/CollectionViewExampleViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class CollectionViewExampleViewController: UIViewController {
3232
title = pageType.title
3333

3434
// This property is used only on iOS 7/8/9/10. See https://developer.apple.com/documentation/uikit/uiviewcontroller/1621372-automaticallyadjustsscrollviewin
35-
automaticallyAdjustsScrollViewInsets = false
3635
}
3736

3837
required init?(coder aDecoder: NSCoder) {
@@ -41,6 +40,7 @@ class CollectionViewExampleViewController: UIViewController {
4140

4241
override func loadView() {
4342
view = CollectionViewExampleView()
43+
4444
mainView.configure(houses: [
4545
House(name: "Castlecrag House",
4646
price: "1,500,000$",

Diff for: ‎Example/PinLayoutSample/UI/Examples/IntroObjectiveC/IntroObjectiveCViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ - (void)loadView {
3838

3939
- (void)viewWillLayoutSubviews {
4040
[super viewWillLayoutSubviews];
41-
[((IntroObjectiveCView*)self.view) setLayoutGuidesTop:self.topLayoutGuide.length];
41+
[((IntroObjectiveCView*)self.view) setLayoutGuidesTop:self.view.safeAreaInsets.top];
4242
}
4343

4444
@end

Diff for: ‎Gemfile.lock

+20-21
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.5)
4+
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (6.1.4.4)
6+
activesupport (7.0.4.3)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
11-
zeitwerk (~> 2.3)
12-
addressable (2.8.0)
13-
public_suffix (>= 2.0.2, < 5.0)
11+
addressable (2.8.1)
12+
public_suffix (>= 2.0.2, < 6.0)
1413
algoliasearch (1.27.5)
1514
httpclient (~> 2.8, >= 2.8.3)
1615
json (>= 1.5.1)
1716
atomos (0.1.3)
1817
claide (1.1.0)
19-
cocoapods (1.11.2)
18+
cocoapods (1.12.0)
2019
addressable (~> 2.8)
2120
claide (>= 1.0.2, < 2.0)
22-
cocoapods-core (= 1.11.2)
21+
cocoapods-core (= 1.12.0)
2322
cocoapods-deintegrate (>= 1.0.3, < 2.0)
24-
cocoapods-downloader (>= 1.4.0, < 2.0)
23+
cocoapods-downloader (>= 1.6.0, < 2.0)
2524
cocoapods-plugins (>= 1.0.0, < 2.0)
2625
cocoapods-search (>= 1.0.0, < 2.0)
27-
cocoapods-trunk (>= 1.4.0, < 2.0)
26+
cocoapods-trunk (>= 1.6.0, < 2.0)
2827
cocoapods-try (>= 1.1.0, < 2.0)
2928
colored2 (~> 3.1)
3029
escape (~> 0.0.4)
3130
fourflusher (>= 2.3.0, < 3.0)
3231
gh_inspector (~> 1.0)
3332
molinillo (~> 0.8.0)
3433
nap (~> 1.0)
35-
ruby-macho (>= 1.0, < 3.0)
34+
ruby-macho (>= 2.3.0, < 3.0)
3635
xcodeproj (>= 1.21.0, < 2.0)
37-
cocoapods-core (1.11.2)
38-
activesupport (>= 5.0, < 7)
36+
cocoapods-core (1.12.0)
37+
activesupport (>= 5.0, < 8)
3938
addressable (~> 2.8)
4039
algoliasearch (~> 1.0)
4140
concurrent-ruby (~> 1.1)
@@ -54,40 +53,40 @@ GEM
5453
netrc (~> 0.11)
5554
cocoapods-try (1.2.0)
5655
colored2 (3.1.2)
57-
concurrent-ruby (1.1.9)
56+
concurrent-ruby (1.2.2)
5857
escape (0.0.4)
59-
ethon (0.15.0)
58+
ethon (0.16.0)
6059
ffi (>= 1.15.0)
6160
ffi (1.15.5)
6261
fourflusher (2.3.1)
6362
fuzzy_match (2.0.4)
6463
gh_inspector (1.1.3)
6564
httpclient (2.8.3)
66-
i18n (1.9.1)
65+
i18n (1.12.0)
6766
concurrent-ruby (~> 1.0)
68-
json (2.6.1)
69-
minitest (5.15.0)
67+
json (2.6.3)
68+
minitest (5.18.0)
7069
molinillo (0.8.0)
7170
nanaimo (0.3.0)
7271
nap (1.1.0)
7372
netrc (0.11.0)
74-
public_suffix (4.0.6)
73+
public_suffix (4.0.7)
7574
rexml (3.2.5)
7675
ruby-macho (2.5.1)
7776
typhoeus (1.4.0)
7877
ethon (>= 0.9.0)
79-
tzinfo (2.0.4)
78+
tzinfo (2.0.6)
8079
concurrent-ruby (~> 1.0)
81-
xcodeproj (1.21.0)
80+
xcodeproj (1.22.0)
8281
CFPropertyList (>= 2.3.3, < 4.0)
8382
atomos (~> 0.1.3)
8483
claide (>= 1.0.2, < 2.0)
8584
colored2 (~> 3.1)
8685
nanaimo (~> 0.3.0)
8786
rexml (~> 3.2.4)
88-
zeitwerk (2.5.4)
8987

9088
PLATFORMS
89+
arm64-darwin-22
9190
universal-darwin-21
9291
x86_64-linux
9392

Diff for: ‎PinLayout.podspec

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88

99
Pod::Spec.new do |spec|
1010
spec.name = "PinLayout"
11-
spec.version = "1.10.3"
11+
spec.version = "1.10.4"
1212
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
1313
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
1414
spec.homepage = "https://github.com/layoutBox/PinLayout"
1515
spec.license = "MIT license"
1616
spec.author = { "Luc Dion" => "[email protected]" }
1717
spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
1818
spec.source_files = "Sources/**/*.swift"
19-
spec.swift_versions = ['4.2', '5.0', '5.1', '5.2', '5.3', '5.4']
19+
spec.swift_versions = ['4.2', '5.7']
2020

21-
spec.ios.deployment_target = '9.0'
21+
spec.ios.deployment_target = '12.0'
2222
spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
2323

24-
spec.tvos.deployment_target = '9.0'
24+
spec.tvos.deployment_target = '12.0'
2525
spec.tvos.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
2626

27-
spec.osx.deployment_target = '10.11'
27+
spec.osx.deployment_target = '10.13'
2828
spec.osx.frameworks = 'Foundation', 'CoreGraphics', 'AppKit'
2929
end

0 commit comments

Comments
 (0)