The Xcode workspace to be compatible with Xcode 10.2 and Swift 5.0. (#37

)
Nike-Inc · Apr 30, 2019 · 4fd4299 · 4fd4299
1 parent 5e254aa
commit 4fd4299
Show file tree

Hide file tree

Showing 17 changed files with 212 additions and 88 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode10
+osx_image: xcode10.2
 branches:
   only:
     - master
@@ -14,7 +14,7 @@ env:
   - TVOS_FRAMEWORK_SCHEME="Elevate tvOS"
   - WATCHOS_FRAMEWORK_SCHEME="Elevate watchOS"
   matrix:
-    - DESTINATION="OS=12.0,name=iPhone XS"                  SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="OS=12.2,name=iPhone XS"                  SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="YES"
     - DESTINATION="OS=11.4,name=iPhone X"                   SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
     - DESTINATION="OS=10.3.1,name=iPhone 7"                 SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"
     - DESTINATION="OS=9.3,name=iPhone 5S"                   SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" POD_LINT="NO"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,17 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [3.1.0](https://github.com/Nike-Inc/Elevate/releases/tag/3.1.0)
+
+Released on 2019-04-30. All issues associated with this milestone can be found using this
+[filter](https://github.com/Nike-Inc/Elevate/milestone/7?closed=1).
+
+#### Updated
+
+- The Xcode workspace to be compatible with Xcode 10.2 and Swift 5.0.
+  - Updated by [Dmitri Fuerle](https://github.com/dfuerle) in Pull Request
+[#37](https://github.com/Nike-Inc/Elevate/pull/37).
+
 ## [3.0.2](https://github.com/Nike-Inc/Elevate/releases/tag/3.0.2)
 
 Released on 2018-09-17. All issues associated with this milestone can be found using this

diff --git a/Elevate.podspec b/Elevate.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name = "Elevate"
-  s.version = "3.0.2"
+  s.version = "3.1.0"
   s.summary = "Elevate is a JSON parsing framework that leverages Swift to make parsing simple, reliable and composable."
   s.homepage = "https://github.com/Nike-Inc/Elevate"
   s.license = "MIT"
   s.authors = { "Eric Appel" => "[email protected]", "Christian Noon" => "[email protected]" }
 
   s.source = { :git => "https://github.com/Nike-Inc/Elevate.git", :tag => s.version }
   s.source_files = "Source/*.swift"
-  s.swift_version = "4.2"
+  s.swift_versions = ["4.2", "5.0"]
 
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.11"

diff --git a/Elevate.xcodeproj/project.pbxproj b/Elevate.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 48;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -126,7 +126,6 @@
 /* Begin PBXFileReference section */
 		4C0C61901C161E2700BBB2F9 /* SchemaPropertyExtraction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchemaPropertyExtraction.swift; sourceTree = "<group>"; };
 		4C0C61941C161E7800BBB2F9 /* PropertyExtractionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PropertyExtractionTests.swift; sourceTree = "<group>"; };
-		4C0CE3951CFF93B200D57B03 /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = "<group>"; };
 		4C5EA12F1C8A72A600BA4202 /* Decoders.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Decoders.swift; sourceTree = "<group>"; };
 		4C5EA1301C8A72A600BA4202 /* ModelObjects.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ModelObjects.swift; sourceTree = "<group>"; };
 		4C5FB49D1B55C229001258D3 /* ArrayTest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = ArrayTest.json; sourceTree = "<group>"; };
@@ -167,6 +166,7 @@
 		E99C82031B55E3380090FA56 /* DecodableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecodableTests.swift; sourceTree = "<group>"; };
 		E99C82061B55E5B50090FA56 /* ParserTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParserTests.swift; sourceTree = "<group>"; };
 		E9CDF95F1D7F833200639059 /* Elevate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Elevate.swift; sourceTree = "<group>"; };
+		F6D1E6A62278C7D000D4C674 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "[email protected]"; sourceTree = "<group>"; };
 		FC79DCD71DCD2EDC0081379C /* RootObjectTest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = RootObjectTest.json; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -269,6 +269,7 @@
 				4CA7AB9F1F5604DD004CE3F3 /* Elevate.podspec */,
 				4CA7ABA01F5604DD004CE3F3 /* LICENSE */,
 				4CA7AB981F560466004CE3F3 /* Package.swift */,
+				F6D1E6A62278C7D000D4C674 /* [email protected] */,
 			);
 			name = Deployment;
 			sourceTree = "<group>";
@@ -347,7 +348,6 @@
 			children = (
 				E91C4DF51B5475CC000481D2 /* Elevate.h */,
 				E91C4DF71B5475CC000481D2 /* Info.plist */,
-				4C0CE3951CFF93B200D57B03 /* Info-tvOS.plist */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -543,7 +543,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Nike;
 				TargetAttributes = {
 					4CA33F3E1B7558C30047C307 = {
@@ -563,12 +563,12 @@
 					};
 					E91C4DD71B547559000481D2 = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					E91C4DE11B547559000481D2 = {
 						CreatedOnToolsVersion = 7.0;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					E91C4E111B5477BD000481D2 = {
@@ -583,11 +583,12 @@
 				};
 			};
 			buildConfigurationList = E91C4DD21B547559000481D2 /* Build configuration list for PBXProject "Elevate" */;
-			compatibilityVersion = "Xcode 8.0";
-			developmentRegion = English;
+			compatibilityVersion = "Xcode 10.0";
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = E91C4DCE1B547559000481D2;
 			productRefGroup = E91C4DD91B547559000481D2 /* Products */;
@@ -823,7 +824,11 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
 				PRODUCT_NAME = Elevate;
 				SDKROOT = watchos;
@@ -845,7 +850,11 @@
 				ENABLE_TESTABILITY = NO;
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
 				PRODUCT_NAME = Elevate;
 				SDKROOT = watchos;
@@ -864,9 +873,13 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Source/Info-tvOS.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
 				PRODUCT_NAME = Elevate;
 				SDKROOT = appletvos;
@@ -885,9 +898,13 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Source/Info-tvOS.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
 				PRODUCT_NAME = Elevate;
 				SDKROOT = appletvos;
@@ -903,7 +920,11 @@
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Tests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
 				PRODUCT_NAME = ElevateTests;
 				SDKROOT = appletvos;
@@ -917,7 +938,11 @@
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Tests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
 				PRODUCT_NAME = ElevateTests;
 				SDKROOT = appletvos;
@@ -928,6 +953,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -991,6 +1017,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1057,10 +1084,15 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
 				PRODUCT_NAME = Elevate;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1078,10 +1110,15 @@
 				ENABLE_TESTABILITY = NO;
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
 				PRODUCT_NAME = Elevate;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1092,9 +1129,14 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Tests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
 				PRODUCT_NAME = ElevateTests;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1105,9 +1147,14 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Tests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
 				PRODUCT_NAME = ElevateTests;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1126,7 +1173,11 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
 				PRODUCT_NAME = Elevate;
 				SDKROOT = macosx;
@@ -1150,7 +1201,11 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
 				PRODUCT_NAME = Elevate;
 				SDKROOT = macosx;
@@ -1166,7 +1221,11 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
 				PRODUCT_NAME = ElevateTests;
 				SDKROOT = macosx;
@@ -1181,7 +1240,11 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Tests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
 				PRODUCT_NAME = ElevateTests;
 				SDKROOT = macosx;

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

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

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

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

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,12 @@
+#
+#  Gemfile
+#  Elevate
+#
+#  Created by Dmitri Fuerle on 4/30/19.
+#  Copyright © 2019 Nike. All rights reserved.
+#
+
 source "https://rubygems.org"
 
-gem "cocoapods", "~> 1.6.0.beta.1"
+gem "cocoapods", "~> 1.7.0.beta.3"
 gem "xcpretty"