Skip to content

Commit 5629177

Browse files
lucdionlucdion
committed
Update
1 parent 185e15b commit 5629177

File tree

5 files changed

+38
-39
lines changed

5 files changed

+38
-39
lines changed

‎Example/FlexLayoutSample.xcodeproj/project.pbxproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
isa = PBXProject;
462462
attributes = {
463463
LastSwiftUpdateCheck = 1130;
464-
LastUpgradeCheck = 1030;
464+
LastUpgradeCheck = 1250;
465465
ORGANIZATIONNAME = Mirego;
466466
TargetAttributes = {
467467
B9EA7C512409B79B000D8E35 = {
@@ -696,6 +696,7 @@
696696
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
697697
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
698698
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
699+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
699700
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
700701
CLANG_WARN_STRICT_PROTOTYPES = YES;
701702
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -720,7 +721,7 @@
720721
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
721722
GCC_WARN_UNUSED_FUNCTION = YES;
722723
GCC_WARN_UNUSED_VARIABLE = YES;
723-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
724+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
724725
MTL_ENABLE_DEBUG_INFO = YES;
725726
ONLY_ACTIVE_ARCH = YES;
726727
SDKROOT = iphoneos;
@@ -757,6 +758,7 @@
757758
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
758759
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
759760
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
761+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
760762
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
761763
CLANG_WARN_STRICT_PROTOTYPES = YES;
762764
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -775,7 +777,7 @@
775777
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
776778
GCC_WARN_UNUSED_FUNCTION = YES;
777779
GCC_WARN_UNUSED_VARIABLE = YES;
778-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
780+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
779781
MTL_ENABLE_DEBUG_INFO = NO;
780782
SDKROOT = iphoneos;
781783
SWIFT_COMPILATION_MODE = wholemodule;
@@ -801,7 +803,7 @@
801803
"FLEXLAYOUT_SWIFT_PACKAGE=1",
802804
);
803805
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
804-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
806+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
805807
LD_RUNPATH_SEARCH_PATHS = (
806808
"$(inherited)",
807809
"@executable_path/Frameworks",
@@ -824,7 +826,7 @@
824826
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
825827
CODE_SIGN_STYLE = Automatic;
826828
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
827-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
829+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
828830
LD_RUNPATH_SEARCH_PATHS = (
829831
"$(inherited)",
830832
"@executable_path/Frameworks",
@@ -844,7 +846,7 @@
844846
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
845847
GCC_INPUT_FILETYPE = automatic;
846848
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
847-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
849+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
848850
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
849851
PRODUCT_NAME = "$(TARGET_NAME)";
850852
SWIFT_VERSION = 5.0;
@@ -858,7 +860,7 @@
858860
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
859861
GCC_INPUT_FILETYPE = automatic;
860862
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
861-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
863+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
862864
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
863865
PRODUCT_NAME = "$(TARGET_NAME)";
864866
SWIFT_VERSION = 5.0;

‎Example/FlexLayoutSample.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample.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 = "1250"
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 = "DF1F2A051F17D11700BA1B97"
34+
BuildableName = "FlexLayoutSample.app"
35+
BlueprintName = "FlexLayoutSample"
36+
ReferencedContainer = "container:FlexLayoutSample.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 = "DF1F2A051F17D11700BA1B97"
46-
BuildableName = "FlexLayoutSample.app"
47-
BlueprintName = "FlexLayoutSample"
48-
ReferencedContainer = "container:FlexLayoutSample.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:FlexLayoutSample.xcodeproj">
7270
</BuildableReference>
7371
</BuildableProductRunnable>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎Example/FlexLayoutSample/UI/Examples/RaywenderlichTutorial/RaywenderlichTutorialViewController.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ class RayWenderlichTutorialViewController: BaseViewController {
2424
title = pageType.text
2525

2626
// This property is used only on iOS 7/8/9/10. See https://developer.apple.com/documentation/uikit/uiviewcontroller/1621372-automaticallyadjustsscrollviewin
27-
automaticallyAdjustsScrollViewInsets = false
27+
if #available(iOS 11.0, *) {
28+
} else {
29+
automaticallyAdjustsScrollViewInsets = false
30+
}
2831
}
2932

3033
required init?(coder aDecoder: NSCoder) {

‎FlexLayout.xcodeproj/project.pbxproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@
365365
isa = PBXProject;
366366
attributes = {
367367
LastSwiftUpdateCheck = 0830;
368-
LastUpgradeCheck = 1030;
368+
LastUpgradeCheck = 1250;
369369
ORGANIZATIONNAME = Mirego;
370370
TargetAttributes = {
371371
24DA37591EF843C500D1AB2F = {
@@ -532,6 +532,7 @@
532532
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
533533
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
534534
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
535+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
535536
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
536537
CLANG_WARN_STRICT_PROTOTYPES = YES;
537538
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -558,7 +559,7 @@
558559
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
559560
GCC_WARN_UNUSED_FUNCTION = YES;
560561
GCC_WARN_UNUSED_VARIABLE = YES;
561-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
562+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
562563
MTL_ENABLE_DEBUG_INFO = YES;
563564
ONLY_ACTIVE_ARCH = YES;
564565
SDKROOT = iphoneos;
@@ -599,6 +600,7 @@
599600
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
600601
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
601602
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
603+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
602604
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
603605
CLANG_WARN_STRICT_PROTOTYPES = YES;
604606
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -619,7 +621,7 @@
619621
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
620622
GCC_WARN_UNUSED_FUNCTION = YES;
621623
GCC_WARN_UNUSED_VARIABLE = YES;
622-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
624+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
623625
MTL_ENABLE_DEBUG_INFO = NO;
624626
SDKROOT = iphoneos;
625627
SWIFT_ACTIVE_COMPILATION_CONDITIONS = XCODE_PROJECT_BUILD;

‎FlexLayout.xcodeproj/xcshareddata/xcschemes/FlexLayout.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 = "1250"
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 = "24DA37591EF843C500D1AB2F"
34+
BuildableName = "FlexLayout.framework"
35+
BlueprintName = "FlexLayout"
36+
ReferencedContainer = "container:FlexLayout.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 = "24DA37591EF843C500D1AB2F"
46-
BuildableName = "FlexLayout.framework"
47-
BlueprintName = "FlexLayout"
48-
ReferencedContainer = "container:FlexLayout.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:FlexLayout.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

0 commit comments

Comments
 (0)