Swift 4.1 Upgrade

kouky · Jul 7, 2018 · 7e5223e · 7e5223e
1 parent 570367d
commit 7e5223e
Show file tree

Hide file tree

Showing 44 changed files with 920 additions and 293 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,12 +19,14 @@ xcuserdata/
 
 ## Other
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
 *.ipa
+*.dSYM.zip
+*.dSYM
 
 ## Playgrounds
 timeline.xctimeline
@@ -34,6 +36,8 @@ playground.xcworkspace
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
+# Package.pins
+# Package.resolved
 .build/
 
 # CocoaPods
@@ -43,6 +47,9 @@ playground.xcworkspace
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #
@@ -53,10 +60,12 @@ Carthage/Build
 
 # fastlane
 #
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 fastlane/report.xml
-fastlane/screenshots
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "Vendor/xcconfigs"]
-	path = Vendor/xcconfigs
-	url = https://github.com/jspahrsummers/xcconfigs.git

diff --git a/PrimaryFlightDisplay.xcodeproj/project.pbxproj b/PrimaryFlightDisplay.xcodeproj/project.pbxproj
@@ -43,17 +43,15 @@
 		27B180261C844996006EEC9D /* TapeCellTriad.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B180001C844973006EEC9D /* TapeCellTriad.swift */; };
 		27B180271C844996006EEC9D /* TapeIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B180011C844973006EEC9D /* TapeIndicator.swift */; };
 		27B180281C844996006EEC9D /* TapePointer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B180021C844973006EEC9D /* TapePointer.swift */; };
+		27EDC58D20F0B5EE00BB13A8 /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 27EDC58B20F0B5EE00BB13A8 /* Release.xcconfig */; };
+		27EDC58E20F0B5EE00BB13A8 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 27EDC58C20F0B5EE00BB13A8 /* Debug.xcconfig */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		270D5FCF1C858D8700FB478A /* PrimaryFlightDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrimaryFlightDisplay.h; path = Sources/PrimaryFlightDisplay.h; sourceTree = SOURCE_ROOT; };
 		27B17FC41C84309F006EEC9D /* PrimaryFlightDisplay.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PrimaryFlightDisplay.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		27B17FD01C843377006EEC9D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Resources/Info.plist; sourceTree = SOURCE_ROOT; };
 		27B17FD91C843D73006EEC9D /* PrimaryFlightDisplay.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PrimaryFlightDisplay.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		27B17FE81C8445C9006EEC9D /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "Mac-Framework.xcconfig"; path = "Vendor/xcconfigs/Mac OS X/Mac-Framework.xcconfig"; sourceTree = "<group>"; };
-		27B17FEA1C8445DD006EEC9D /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "Vendor/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = "<group>"; };
-		27B17FEC1C8445F6006EEC9D /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Vendor/xcconfigs/Base/Configurations/Debug.xcconfig; sourceTree = "<group>"; };
-		27B17FEE1C844609006EEC9D /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Vendor/xcconfigs/Base/Configurations/Release.xcconfig; sourceTree = "<group>"; };
 		27B17FF01C844972006EEC9D /* Double+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Double+Additions.swift"; path = "Sources/Double+Additions.swift"; sourceTree = "<group>"; };
 		27B17FF11C844972006EEC9D /* Attitude.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Attitude.swift; path = Sources/Attitude.swift; sourceTree = "<group>"; };
 		27B17FF21C844972006EEC9D /* AttitudeReferenceIndex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AttitudeReferenceIndex.swift; path = Sources/AttitudeReferenceIndex.swift; sourceTree = "<group>"; };
@@ -71,6 +69,10 @@
 		27B180001C844973006EEC9D /* TapeCellTriad.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TapeCellTriad.swift; path = Sources/TapeCellTriad.swift; sourceTree = "<group>"; };
 		27B180011C844973006EEC9D /* TapeIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TapeIndicator.swift; path = Sources/TapeIndicator.swift; sourceTree = "<group>"; };
 		27B180021C844973006EEC9D /* TapePointer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TapePointer.swift; path = Sources/TapePointer.swift; sourceTree = "<group>"; };
+		27EDC58820F0B5A600BB13A8 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "iOS-Framework.xcconfig"; path = "Resources/xcconfigs/iOS/iOS-Framework.xcconfig"; sourceTree = SOURCE_ROOT; };
+		27EDC58A20F0B5D400BB13A8 /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Mac-Framework.xcconfig"; path = "Resources/xcconfigs/Mac OS X/Mac-Framework.xcconfig"; sourceTree = SOURCE_ROOT; };
+		27EDC58B20F0B5EE00BB13A8 /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Resources/xcconfigs/Base/Configurations/Release.xcconfig; sourceTree = SOURCE_ROOT; };
+		27EDC58C20F0B5EE00BB13A8 /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Resources/xcconfigs/Base/Configurations/Debug.xcconfig; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -96,7 +98,6 @@
 			children = (
 				27B17FCF1C84335D006EEC9D /* Sources */,
 				27B17FC61C84309F006EEC9D /* Resources */,
-				27B17FE71C8445A5006EEC9D /* Config */,
 				27B17FC51C84309F006EEC9D /* Products */,
 			);
 			sourceTree = "<group>";
@@ -113,6 +114,10 @@
 		27B17FC61C84309F006EEC9D /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				27EDC58C20F0B5EE00BB13A8 /* Debug.xcconfig */,
+				27EDC58B20F0B5EE00BB13A8 /* Release.xcconfig */,
+				27EDC58A20F0B5D400BB13A8 /* Mac-Framework.xcconfig */,
+				27EDC58820F0B5A600BB13A8 /* iOS-Framework.xcconfig */,
 				270D5FCF1C858D8700FB478A /* PrimaryFlightDisplay.h */,
 				27B17FD01C843377006EEC9D /* Info.plist */,
 			);
@@ -141,17 +146,6 @@
 			name = Sources;
 			sourceTree = "<group>";
 		};
-		27B17FE71C8445A5006EEC9D /* Config */ = {
-			isa = PBXGroup;
-			children = (
-				27B17FEE1C844609006EEC9D /* Release.xcconfig */,
-				27B17FEC1C8445F6006EEC9D /* Debug.xcconfig */,
-				27B17FEA1C8445DD006EEC9D /* iOS-Framework.xcconfig */,
-				27B17FE81C8445C9006EEC9D /* Mac-Framework.xcconfig */,
-			);
-			name = Config;
-			sourceTree = "<group>";
-		};
 		27B180351C857F84006EEC9D /* NumericExtensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -261,6 +255,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				27EDC58E20F0B5EE00BB13A8 /* Debug.xcconfig in Resources */,
+				27EDC58D20F0B5EE00BB13A8 /* Release.xcconfig in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -327,7 +323,7 @@
 /* Begin XCBuildConfiguration section */
 		27B17FCA1C84309F006EEC9D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 27B17FEC1C8445F6006EEC9D /* Debug.xcconfig */;
+			baseConfigurationReference = 27EDC58C20F0B5EE00BB13A8 /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -369,6 +365,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -377,7 +374,7 @@
 		};
 		27B17FCB1C84309F006EEC9D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 27B17FEE1C844609006EEC9D /* Release.xcconfig */;
+			baseConfigurationReference = 27EDC58B20F0B5EE00BB13A8 /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -411,6 +408,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -420,7 +418,7 @@
 		};
 		27B17FCD1C84309F006EEC9D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 27B17FEA1C8445DD006EEC9D /* iOS-Framework.xcconfig */;
+			baseConfigurationReference = 27EDC58820F0B5A600BB13A8 /* iOS-Framework.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -441,7 +439,7 @@
 		};
 		27B17FCE1C84309F006EEC9D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 27B17FEA1C8445DD006EEC9D /* iOS-Framework.xcconfig */;
+			baseConfigurationReference = 27EDC58820F0B5A600BB13A8 /* iOS-Framework.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -461,7 +459,7 @@
 		};
 		27B17FDF1C843D73006EEC9D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 27B17FE81C8445C9006EEC9D /* Mac-Framework.xcconfig */;
+			baseConfigurationReference = 27EDC58A20F0B5D400BB13A8 /* Mac-Framework.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
@@ -483,7 +481,7 @@
 		};
 		27B17FE01C843D73006EEC9D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 27B17FE81C8445C9006EEC9D /* Mac-Framework.xcconfig */;
+			baseConfigurationReference = 27EDC58A20F0B5D400BB13A8 /* Mac-Framework.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;

diff --git a/PrimaryFlightDisplay.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PrimaryFlightDisplay.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/PrimaryFlightDisplay.xcodeproj/xcshareddata/xcschemes/PrimaryFlightDisplay-Mac.xcscheme b/PrimaryFlightDisplay.xcodeproj/xcshareddata/xcschemes/PrimaryFlightDisplay-Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/PrimaryFlightDisplay.xcodeproj/xcshareddata/xcschemes/PrimaryFlightDisplay-iOS.xcscheme b/PrimaryFlightDisplay.xcodeproj/xcshareddata/xcschemes/PrimaryFlightDisplay-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ The framework enables convenient embedding and animation of a primary flight dis
 ## Requirements
 
 - iOS 9.0+ / Mac OS X 10.10+
-- Xcode 7.2+
+- Xcode 9.3+
 
 ## Installation
 

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.0</string>
+	<string>0.7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>