Skip to content

Commit 8cf7f03

Browse files
lucdionlucdion
committed
Update project version
1 parent b455aca commit 8cf7f03

12 files changed

Lines changed: 57 additions & 42 deletions

File tree

‎Example/PinLayoutSample.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 12 deletions
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
};

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

Lines changed: 1 addition & 1 deletion
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"

‎Example/PinLayoutSample/UI/Examples/CollectionViewExample/CollectionViewExampleView.swift‎

Lines changed: 2 additions & 1 deletion
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

‎Example/PinLayoutSample/UI/Examples/CollectionViewExample/CollectionViewExampleViewController.swift‎

Lines changed: 1 addition & 1 deletion
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$",

‎Example/PinLayoutSample/UI/Examples/IntroObjectiveC/IntroObjectiveCViewController.m‎

Lines changed: 1 addition & 1 deletion
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

‎PinLayout.podspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ Pod::Spec.new do |spec|
1616
spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
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.7']
1920

20-
spec.ios.deployment_target = '9.0'
21+
spec.ios.deployment_target = '11.0'
2122
spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
2223

23-
spec.tvos.deployment_target = '9.0'
24+
spec.tvos.deployment_target = '11.0'
2425
spec.tvos.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
2526

2627
spec.osx.deployment_target = '10.11'

‎PinLayout.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@
647647
isa = PBXProject;
648648
attributes = {
649649
LastSwiftUpdateCheck = 0930;
650-
LastUpgradeCheck = 1300;
650+
LastUpgradeCheck = 1420;
651651
ORGANIZATIONNAME = mcswiftlayyout.mirego.com;
652652
TargetAttributes = {
653653
244DF2F71EF46C500090508B = {
@@ -1090,6 +1090,7 @@
10901090
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
10911091
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10921092
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1093+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
10931094
PRODUCT_BUNDLE_IDENTIFIER = "com.mirego.PinLayout-tvOS";
10941095
PRODUCT_NAME = PinLayout;
10951096
SDKROOT = appletvos;
@@ -1113,6 +1114,7 @@
11131114
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
11141115
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11151116
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1117+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
11161118
PRODUCT_BUNDLE_IDENTIFIER = "com.mirego.PinLayout-tvOS";
11171119
PRODUCT_NAME = PinLayout;
11181120
SDKROOT = appletvos;
@@ -1262,13 +1264,14 @@
12621264
DYLIB_INSTALL_NAME_BASE = "@rpath";
12631265
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
12641266
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1265-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1267+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12661268
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1269+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
12671270
PRODUCT_BUNDLE_IDENTIFIER = "com.mirego.PinLayout-iOS";
12681271
PRODUCT_NAME = PinLayout;
12691272
SKIP_INSTALL = YES;
12701273
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1271-
TVOS_DEPLOYMENT_TARGET = 9.0;
1274+
TVOS_DEPLOYMENT_TARGET = 12.0;
12721275
};
12731276
name = Debug;
12741277
};
@@ -1284,12 +1287,13 @@
12841287
DYLIB_INSTALL_NAME_BASE = "@rpath";
12851288
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
12861289
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1287-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1290+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12881291
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1292+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
12891293
PRODUCT_BUNDLE_IDENTIFIER = "com.mirego.PinLayout-iOS";
12901294
PRODUCT_NAME = PinLayout;
12911295
SKIP_INSTALL = YES;
1292-
TVOS_DEPLOYMENT_TARGET = 9.0;
1296+
TVOS_DEPLOYMENT_TARGET = 12.0;
12931297
};
12941298
name = Release;
12951299
};
@@ -1302,6 +1306,7 @@
13021306
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
13031307
INFOPLIST_FILE = Tests/Common/Info.plist;
13041308
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1309+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
13051310
PRODUCT_BUNDLE_IDENTIFIER = com.mirego.PinLayoutTests;
13061311
PRODUCT_NAME = "$(TARGET_NAME)";
13071312
};
@@ -1316,6 +1321,7 @@
13161321
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
13171322
INFOPLIST_FILE = Tests/Common/Info.plist;
13181323
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1324+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
13191325
PRODUCT_BUNDLE_IDENTIFIER = com.mirego.PinLayoutTests;
13201326
PRODUCT_NAME = "$(TARGET_NAME)";
13211327
};
@@ -1334,11 +1340,12 @@
13341340
CODE_SIGN_IDENTITY = "";
13351341
CODE_SIGN_STYLE = Automatic;
13361342
COMBINE_HIDPI_IMAGES = YES;
1343+
DEAD_CODE_STRIPPING = YES;
13371344
DEVELOPMENT_TEAM = 4Q596JWQC5;
13381345
GCC_C_LANGUAGE_STANDARD = gnu11;
13391346
INFOPLIST_FILE = Tests/Common/Info.plist;
13401347
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1341-
MACOSX_DEPLOYMENT_TARGET = 10.13;
1348+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
13421349
PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.PinLayoutTestMacOS;
13431350
PRODUCT_NAME = "$(TARGET_NAME)";
13441351
SDKROOT = macosx;
@@ -1359,11 +1366,12 @@
13591366
CODE_SIGN_IDENTITY = "Mac Developer";
13601367
CODE_SIGN_STYLE = Automatic;
13611368
COMBINE_HIDPI_IMAGES = YES;
1369+
DEAD_CODE_STRIPPING = YES;
13621370
DEVELOPMENT_TEAM = 4Q596JWQC5;
13631371
GCC_C_LANGUAGE_STANDARD = gnu11;
13641372
INFOPLIST_FILE = Tests/Common/Info.plist;
13651373
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1366-
MACOSX_DEPLOYMENT_TARGET = 10.13;
1374+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
13671375
PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.PinLayoutTestMacOS;
13681376
PRODUCT_NAME = "$(TARGET_NAME)";
13691377
SDKROOT = macosx;
@@ -1383,6 +1391,7 @@
13831391
CODE_SIGN_IDENTITY = "";
13841392
CODE_SIGN_STYLE = Automatic;
13851393
COMBINE_HIDPI_IMAGES = YES;
1394+
DEAD_CODE_STRIPPING = YES;
13861395
DEFINES_MODULE = YES;
13871396
DEVELOPMENT_TEAM = "";
13881397
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1393,7 +1402,7 @@
13931402
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
13941403
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
13951404
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1396-
MACOSX_DEPLOYMENT_TARGET = 10.11;
1405+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
13971406
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.PinLayout-macOS";
13981407
PRODUCT_NAME = PinLayout;
13991408
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1415,6 +1424,7 @@
14151424
CODE_SIGN_IDENTITY = "";
14161425
CODE_SIGN_STYLE = Automatic;
14171426
COMBINE_HIDPI_IMAGES = YES;
1427+
DEAD_CODE_STRIPPING = YES;
14181428
DEFINES_MODULE = YES;
14191429
DEVELOPMENT_TEAM = "";
14201430
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1425,7 +1435,7 @@
14251435
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
14261436
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14271437
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1428-
MACOSX_DEPLOYMENT_TARGET = 10.11;
1438+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
14291439
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.PinLayout-macOS";
14301440
PRODUCT_NAME = PinLayout;
14311441
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1450,6 +1460,7 @@
14501460
GCC_C_LANGUAGE_STANDARD = gnu11;
14511461
INFOPLIST_FILE = Tests/Common/Info.plist;
14521462
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1463+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
14531464
PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.PinLayoutTestsTVOS;
14541465
PRODUCT_NAME = "$(TARGET_NAME)";
14551466
SDKROOT = appletvos;
@@ -1474,6 +1485,7 @@
14741485
GCC_C_LANGUAGE_STANDARD = gnu11;
14751486
INFOPLIST_FILE = Tests/Common/Info.plist;
14761487
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1488+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
14771489
PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.PinLayoutTestsTVOS;
14781490
PRODUCT_NAME = "$(TARGET_NAME)";
14791491
SDKROOT = appletvos;

‎PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-iOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
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"

‎PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-macOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
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"

‎PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-tvOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
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"

0 commit comments

Comments
 (0)