Skip to content

Commit 7895cbb

Browse files
lucdionlucdion
authored
Merge pull request #223 from layoutBox/update_project
Update cocoapods + supported iOS versions
2 parents 1b566b7 + bab4845 commit 7895cbb

File tree

24 files changed

+216
-182
lines changed

24 files changed

+216
-182
lines changed

‎.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.ruby-version_old

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby-2.6.6

‎.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.5
33

44
cache:
55
- bundler

‎Example/PinLayoutSample.xcodeproj/project.pbxproj

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
24F246141FA8D57100B6332E /* UIImageView+Download.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F246131FA8D57100B6332E /* UIImageView+Download.swift */; };
4242
24F75B5B1EE5644E008DB567 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B591EE5644E008DB567 /* IntroView.swift */; };
4343
24F75B5C1EE5644E008DB567 /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F75B5A1EE5644E008DB567 /* IntroViewController.swift */; };
44+
B30A278A4301304C7DD08E37 /* Pods_PinLayoutSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 641BBAE7F09807BD466749F3 /* Pods_PinLayoutSample.framework */; };
4445
C892FA1924A5821E0086A75E /* AutoSizingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */; };
4546
C892FA1B24A5822B0086A75E /* AutoSizingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1A24A5822B0086A75E /* AutoSizingView.swift */; };
4647
C892FA1D24A584010086A75E /* ContentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C892FA1C24A584010086A75E /* ContentService.swift */; };
@@ -151,6 +152,7 @@
151152
24F246131FA8D57100B6332E /* UIImageView+Download.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImageView+Download.swift"; sourceTree = "<group>"; };
152153
24F75B591EE5644E008DB567 /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
153154
24F75B5A1EE5644E008DB567 /* IntroViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = "<group>"; };
155+
641BBAE7F09807BD466749F3 /* Pods_PinLayoutSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PinLayoutSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
154156
A35A00E6536E49A548E763E6 /* Pods-PinLayoutSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.debug.xcconfig"; sourceTree = "<group>"; };
155157
C589624E868FCB20F7C10918 /* Pods-PinLayoutSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PinLayoutSample.release.xcconfig"; path = "../Pods/Target Support Files/Pods-PinLayoutSample/Pods-PinLayoutSample.release.xcconfig"; sourceTree = "<group>"; };
156158
C892FA1824A5821E0086A75E /* AutoSizingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoSizingViewController.swift; sourceTree = "<group>"; };
@@ -181,6 +183,7 @@
181183
isa = PBXFrameworksBuildPhase;
182184
buildActionMask = 2147483647;
183185
files = (
186+
B30A278A4301304C7DD08E37 /* Pods_PinLayoutSample.framework in Frameworks */,
184187
);
185188
runOnlyForDeploymentPostprocessing = 0;
186189
};
@@ -191,6 +194,7 @@
191194
isa = PBXGroup;
192195
children = (
193196
246812FC1F8D013500462E53 /* NotificationCenter.framework */,
197+
641BBAE7F09807BD466749F3 /* Pods_PinLayoutSample.framework */,
194198
);
195199
name = Frameworks;
196200
sourceTree = "<group>";
@@ -524,7 +528,7 @@
524528
isa = PBXProject;
525529
attributes = {
526530
LastSwiftUpdateCheck = 0900;
527-
LastUpgradeCheck = 1030;
531+
LastUpgradeCheck = 1220;
528532
ORGANIZATIONNAME = layoutbox;
529533
TargetAttributes = {
530534
249EFE3E1E64FAFE00165E39 = {
@@ -769,6 +773,7 @@
769773
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
770774
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
771775
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
776+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
772777
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
773778
CLANG_WARN_STRICT_PROTOTYPES = YES;
774779
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -793,12 +798,13 @@
793798
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
794799
GCC_WARN_UNUSED_FUNCTION = YES;
795800
GCC_WARN_UNUSED_VARIABLE = YES;
796-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
801+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
797802
MTL_ENABLE_DEBUG_INFO = YES;
798803
ONLY_ACTIVE_ARCH = YES;
799804
SDKROOT = iphoneos;
800805
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
801806
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
807+
SWIFT_VERSION = 5.0;
802808
TARGETED_DEVICE_FAMILY = "1,2";
803809
};
804810
name = Debug;
@@ -828,6 +834,7 @@
828834
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
829835
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
830836
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
837+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
831838
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
832839
CLANG_WARN_STRICT_PROTOTYPES = YES;
833840
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -846,10 +853,11 @@
846853
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
847854
GCC_WARN_UNUSED_FUNCTION = YES;
848855
GCC_WARN_UNUSED_VARIABLE = YES;
849-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
856+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
850857
MTL_ENABLE_DEBUG_INFO = NO;
851858
SDKROOT = iphoneos;
852859
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
860+
SWIFT_VERSION = 5.0;
853861
TARGETED_DEVICE_FAMILY = "1,2";
854862
VALIDATE_PRODUCT = YES;
855863
};
@@ -870,6 +878,7 @@
870878
SWIFT_OBJC_BRIDGING_HEADER = "PinLayoutSample/UI/Examples/PinLayoutSample-Bridging-Header.h";
871879
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
872880
SWIFT_VERSION = 5.0;
881+
TVOS_DEPLOYMENT_TARGET = 9.0;
873882
};
874883
name = Debug;
875884
};
@@ -887,6 +896,7 @@
887896
PRODUCT_NAME = "$(TARGET_NAME)";
888897
SWIFT_OBJC_BRIDGING_HEADER = "PinLayoutSample/UI/Examples/PinLayoutSample-Bridging-Header.h";
889898
SWIFT_VERSION = 5.0;
899+
TVOS_DEPLOYMENT_TARGET = 9.0;
890900
};
891901
name = Release;
892902
};

‎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"

‎Example/PinLayoutSample/UI/Common/BaseFormView.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class BaseFormView: UIView {
4141
}
4242

4343
deinit {
44-
NotificationCenter.default.removeObserver(self)
4544
}
4645

4746
override func layoutSubviews() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class HouseCell: UICollectionViewCell {
4141
nameLabel.textColor = .white
4242
headerView.addSubview(nameLabel)
4343

44-
/// IMAGE
44+
// IMAGE
4545
mainImage.backgroundColor = .black
4646
mainImage.contentMode = .scaleAspectFill
4747
mainImage.clipsToBounds = true

‎Example/PinLayoutSample/UI/Menu/MenuView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import UIKit
2121
import PinLayout
2222

23-
protocol MenuViewDelegate: class {
23+
protocol MenuViewDelegate: AnyObject {
2424
func didSelect(pageType: PageType)
2525
}
2626

‎PinLayout.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Pod::Spec.new do |spec|
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']
19+
spec.swift_versions = ['4.2', '5.0', '5.1', '5.2', '5.3']
2020

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

2424
spec.tvos.deployment_target = '9.0'
2525
spec.tvos.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
2626

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

‎PinLayout.xcodeproj/project.pbxproj

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@
647647
isa = PBXProject;
648648
attributes = {
649649
LastSwiftUpdateCheck = 0930;
650-
LastUpgradeCheck = 1030;
650+
LastUpgradeCheck = 1220;
651651
ORGANIZATIONNAME = mcswiftlayyout.mirego.com;
652652
TargetAttributes = {
653653
244DF2F71EF46C500090508B = {
@@ -1096,7 +1096,7 @@
10961096
SKIP_INSTALL = YES;
10971097
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
10981098
TARGETED_DEVICE_FAMILY = 3;
1099-
TVOS_DEPLOYMENT_TARGET = 9.0;
1099+
TVOS_DEPLOYMENT_TARGET = 12.0;
11001100
};
11011101
name = Debug;
11021102
};
@@ -1119,7 +1119,7 @@
11191119
SKIP_INSTALL = YES;
11201120
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
11211121
TARGETED_DEVICE_FAMILY = 3;
1122-
TVOS_DEPLOYMENT_TARGET = 9.0;
1122+
TVOS_DEPLOYMENT_TARGET = 12.0;
11231123
};
11241124
name = Release;
11251125
};
@@ -1148,6 +1148,7 @@
11481148
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
11491149
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11501150
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1151+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
11511152
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
11521153
CLANG_WARN_STRICT_PROTOTYPES = YES;
11531154
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1173,7 +1174,7 @@
11731174
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11741175
GCC_WARN_UNUSED_FUNCTION = YES;
11751176
GCC_WARN_UNUSED_VARIABLE = YES;
1176-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1177+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
11771178
MACOSX_DEPLOYMENT_TARGET = 10.9;
11781179
MTL_ENABLE_DEBUG_INFO = YES;
11791180
ONLY_ACTIVE_ARCH = YES;
@@ -1183,7 +1184,7 @@
11831184
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
11841185
SWIFT_VERSION = 5.0;
11851186
TARGETED_DEVICE_FAMILY = "1,2";
1186-
TVOS_DEPLOYMENT_TARGET = 9.0;
1187+
TVOS_DEPLOYMENT_TARGET = 12.0;
11871188
VERSIONING_SYSTEM = "apple-generic";
11881189
VERSION_INFO_PREFIX = "";
11891190
};
@@ -1214,6 +1215,7 @@
12141215
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12151216
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12161217
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1218+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
12171219
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
12181220
CLANG_WARN_STRICT_PROTOTYPES = YES;
12191221
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1233,15 +1235,15 @@
12331235
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12341236
GCC_WARN_UNUSED_FUNCTION = YES;
12351237
GCC_WARN_UNUSED_VARIABLE = YES;
1236-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1238+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
12371239
MACOSX_DEPLOYMENT_TARGET = 10.9;
12381240
MTL_ENABLE_DEBUG_INFO = NO;
12391241
SDKROOT = iphoneos;
12401242
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
12411243
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
12421244
SWIFT_VERSION = 5.0;
12431245
TARGETED_DEVICE_FAMILY = "1,2";
1244-
TVOS_DEPLOYMENT_TARGET = 9.0;
1246+
TVOS_DEPLOYMENT_TARGET = 12.0;
12451247
VALIDATE_PRODUCT = YES;
12461248
VERSIONING_SYSTEM = "apple-generic";
12471249
VERSION_INFO_PREFIX = "";
@@ -1387,7 +1389,7 @@
13871389
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
13881390
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
13891391
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1390-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1392+
MACOSX_DEPLOYMENT_TARGET = 10.11;
13911393
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.PinLayout-macOS";
13921394
PRODUCT_NAME = PinLayout;
13931395
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1419,7 +1421,7 @@
14191421
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
14201422
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14211423
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1422-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1424+
MACOSX_DEPLOYMENT_TARGET = 10.11;
14231425
PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.PinLayout-macOS";
14241426
PRODUCT_NAME = PinLayout;
14251427
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1449,7 +1451,7 @@
14491451
SDKROOT = appletvos;
14501452
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
14511453
TARGETED_DEVICE_FAMILY = 3;
1452-
TVOS_DEPLOYMENT_TARGET = 11.3;
1454+
TVOS_DEPLOYMENT_TARGET = 12.0;
14531455
};
14541456
name = Debug;
14551457
};
@@ -1473,7 +1475,7 @@
14731475
SDKROOT = appletvos;
14741476
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
14751477
TARGETED_DEVICE_FAMILY = 3;
1476-
TVOS_DEPLOYMENT_TARGET = 11.3;
1478+
TVOS_DEPLOYMENT_TARGET = 12.0;
14771479
};
14781480
name = Release;
14791481
};

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

Lines changed: 12 additions & 16 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"
@@ -26,9 +26,18 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
2930
codeCoverageEnabled = "YES"
30-
onlyGenerateCoverageForSpecifiedTargets = "YES"
31-
shouldUseLaunchSchemeArgsEnv = "YES">
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "249EFE791E64FB4C00165E39"
36+
BuildableName = "PinLayout.framework"
37+
BlueprintName = "PinLayout-iOS"
38+
ReferencedContainer = "container:PinLayout.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
3241
<CodeCoverageTargets>
3342
<BuildableReference
3443
BuildableIdentifier = "primary"
@@ -50,17 +59,6 @@
5059
</BuildableReference>
5160
</TestableReference>
5261
</Testables>
53-
<MacroExpansion>
54-
<BuildableReference
55-
BuildableIdentifier = "primary"
56-
BlueprintIdentifier = "249EFE791E64FB4C00165E39"
57-
BuildableName = "PinLayout.framework"
58-
BlueprintName = "PinLayout-iOS"
59-
ReferencedContainer = "container:PinLayout.xcodeproj">
60-
</BuildableReference>
61-
</MacroExpansion>
62-
<AdditionalOptions>
63-
</AdditionalOptions>
6462
</TestAction>
6563
<LaunchAction
6664
buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
8179
ReferencedContainer = "container:PinLayout.xcodeproj">
8280
</BuildableReference>
8381
</MacroExpansion>
84-
<AdditionalOptions>
85-
</AdditionalOptions>
8682
</LaunchAction>
8783
<ProfileAction
8884
buildConfiguration = "Release"

0 commit comments

Comments
 (0)