Skip to content

Commit 4fd4299

Browse files
dfuerledfuerle
authored
The Xcode workspace to be compatible with Xcode 10.2 and Swift 5.0. (#37)
1 parent 5e254aa commit 4fd4299

17 files changed

+212
-88
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: osx
2-
osx_image: xcode10
2+
osx_image: xcode10.2
33
branches:
44
only:
55
- master
@@ -14,7 +14,7 @@ env:
1414
- TVOS_FRAMEWORK_SCHEME="Elevate tvOS"
1515
- WATCHOS_FRAMEWORK_SCHEME="Elevate watchOS"
1616
matrix:
17-
- DESTINATION="OS=12.0,name=iPhone XS" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="YES"
17+
- DESTINATION="OS=12.2,name=iPhone XS" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="YES"
1818
- DESTINATION="OS=11.4,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO"
1919
- DESTINATION="OS=10.3.1,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO"
2020
- DESTINATION="OS=9.3,name=iPhone 5S" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" POD_LINT="NO"

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ All notable changes to this project will be documented in this file.
2020

2121
---
2222

23+
## [3.1.0](https://github.com/Nike-Inc/Elevate/releases/tag/3.1.0)
24+
25+
Released on 2019-04-30. All issues associated with this milestone can be found using this
26+
[filter](https://github.com/Nike-Inc/Elevate/milestone/7?closed=1).
27+
28+
#### Updated
29+
30+
- The Xcode workspace to be compatible with Xcode 10.2 and Swift 5.0.
31+
- Updated by [Dmitri Fuerle](https://github.com/dfuerle) in Pull Request
32+
[#37](https://github.com/Nike-Inc/Elevate/pull/37).
33+
2334
## [3.0.2](https://github.com/Nike-Inc/Elevate/releases/tag/3.0.2)
2435

2536
Released on 2018-09-17. All issues associated with this milestone can be found using this

‎Elevate.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Pod::Spec.new do |s|
22
s.name = "Elevate"
3-
s.version = "3.0.2"
3+
s.version = "3.1.0"
44
s.summary = "Elevate is a JSON parsing framework that leverages Swift to make parsing simple, reliable and composable."
55
s.homepage = "https://github.com/Nike-Inc/Elevate"
66
s.license = "MIT"
77
s.authors = { "Eric Appel" => "[email protected]", "Christian Noon" => "[email protected]" }
88

99
s.source = { :git => "https://github.com/Nike-Inc/Elevate.git", :tag => s.version }
1010
s.source_files = "Source/*.swift"
11-
s.swift_version = "4.2"
11+
s.swift_versions = ["4.2", "5.0"]
1212

1313
s.ios.deployment_target = "8.0"
1414
s.osx.deployment_target = "10.11"

‎Elevate.xcodeproj/project.pbxproj

+87-24
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 48;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -126,7 +126,6 @@
126126
/* Begin PBXFileReference section */
127127
4C0C61901C161E2700BBB2F9 /* SchemaPropertyExtraction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchemaPropertyExtraction.swift; sourceTree = "<group>"; };
128128
4C0C61941C161E7800BBB2F9 /* PropertyExtractionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PropertyExtractionTests.swift; sourceTree = "<group>"; };
129-
4C0CE3951CFF93B200D57B03 /* Info-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-tvOS.plist"; sourceTree = "<group>"; };
130129
4C5EA12F1C8A72A600BA4202 /* Decoders.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Decoders.swift; sourceTree = "<group>"; };
131130
4C5EA1301C8A72A600BA4202 /* ModelObjects.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ModelObjects.swift; sourceTree = "<group>"; };
132131
4C5FB49D1B55C229001258D3 /* ArrayTest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = ArrayTest.json; sourceTree = "<group>"; };
@@ -167,6 +166,7 @@
167166
E99C82031B55E3380090FA56 /* DecodableTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecodableTests.swift; sourceTree = "<group>"; };
168167
E99C82061B55E5B50090FA56 /* ParserTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParserTests.swift; sourceTree = "<group>"; };
169168
E9CDF95F1D7F833200639059 /* Elevate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Elevate.swift; sourceTree = "<group>"; };
169+
F6D1E6A62278C7D000D4C674 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "[email protected]"; sourceTree = "<group>"; };
170170
FC79DCD71DCD2EDC0081379C /* RootObjectTest.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = RootObjectTest.json; sourceTree = "<group>"; };
171171
/* End PBXFileReference section */
172172

@@ -269,6 +269,7 @@
269269
4CA7AB9F1F5604DD004CE3F3 /* Elevate.podspec */,
270270
4CA7ABA01F5604DD004CE3F3 /* LICENSE */,
271271
4CA7AB981F560466004CE3F3 /* Package.swift */,
272+
F6D1E6A62278C7D000D4C674 /* [email protected] */,
272273
);
273274
name = Deployment;
274275
sourceTree = "<group>";
@@ -347,7 +348,6 @@
347348
children = (
348349
E91C4DF51B5475CC000481D2 /* Elevate.h */,
349350
E91C4DF71B5475CC000481D2 /* Info.plist */,
350-
4C0CE3951CFF93B200D57B03 /* Info-tvOS.plist */,
351351
);
352352
name = "Supporting Files";
353353
sourceTree = "<group>";
@@ -543,7 +543,7 @@
543543
isa = PBXProject;
544544
attributes = {
545545
LastSwiftUpdateCheck = 0720;
546-
LastUpgradeCheck = 0930;
546+
LastUpgradeCheck = 1020;
547547
ORGANIZATIONNAME = Nike;
548548
TargetAttributes = {
549549
4CA33F3E1B7558C30047C307 = {
@@ -563,12 +563,12 @@
563563
};
564564
E91C4DD71B547559000481D2 = {
565565
CreatedOnToolsVersion = 7.0;
566-
LastSwiftMigration = 1000;
566+
LastSwiftMigration = 1020;
567567
ProvisioningStyle = Manual;
568568
};
569569
E91C4DE11B547559000481D2 = {
570570
CreatedOnToolsVersion = 7.0;
571-
LastSwiftMigration = 1000;
571+
LastSwiftMigration = 1020;
572572
ProvisioningStyle = Automatic;
573573
};
574574
E91C4E111B5477BD000481D2 = {
@@ -583,11 +583,12 @@
583583
};
584584
};
585585
buildConfigurationList = E91C4DD21B547559000481D2 /* Build configuration list for PBXProject "Elevate" */;
586-
compatibilityVersion = "Xcode 8.0";
587-
developmentRegion = English;
586+
compatibilityVersion = "Xcode 10.0";
587+
developmentRegion = en;
588588
hasScannedForEncodings = 0;
589589
knownRegions = (
590590
en,
591+
Base,
591592
);
592593
mainGroup = E91C4DCE1B547559000481D2;
593594
productRefGroup = E91C4DD91B547559000481D2 /* Products */;
@@ -823,7 +824,11 @@
823824
DYLIB_INSTALL_NAME_BASE = "@rpath";
824825
INFOPLIST_FILE = Source/Info.plist;
825826
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
826-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
827+
LD_RUNPATH_SEARCH_PATHS = (
828+
"$(inherited)",
829+
"@executable_path/Frameworks",
830+
"@loader_path/Frameworks",
831+
);
827832
PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
828833
PRODUCT_NAME = Elevate;
829834
SDKROOT = watchos;
@@ -845,7 +850,11 @@
845850
ENABLE_TESTABILITY = NO;
846851
INFOPLIST_FILE = Source/Info.plist;
847852
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
848-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
853+
LD_RUNPATH_SEARCH_PATHS = (
854+
"$(inherited)",
855+
"@executable_path/Frameworks",
856+
"@loader_path/Frameworks",
857+
);
849858
PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
850859
PRODUCT_NAME = Elevate;
851860
SDKROOT = watchos;
@@ -864,9 +873,13 @@
864873
DYLIB_COMPATIBILITY_VERSION = 1;
865874
DYLIB_CURRENT_VERSION = 1;
866875
DYLIB_INSTALL_NAME_BASE = "@rpath";
867-
INFOPLIST_FILE = "Source/Info-tvOS.plist";
876+
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
868877
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
869-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
878+
LD_RUNPATH_SEARCH_PATHS = (
879+
"$(inherited)",
880+
"@executable_path/Frameworks",
881+
"@loader_path/Frameworks",
882+
);
870883
PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
871884
PRODUCT_NAME = Elevate;
872885
SDKROOT = appletvos;
@@ -885,9 +898,13 @@
885898
DYLIB_COMPATIBILITY_VERSION = 1;
886899
DYLIB_CURRENT_VERSION = 1;
887900
DYLIB_INSTALL_NAME_BASE = "@rpath";
888-
INFOPLIST_FILE = "Source/Info-tvOS.plist";
901+
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
889902
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
890-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
903+
LD_RUNPATH_SEARCH_PATHS = (
904+
"$(inherited)",
905+
"@executable_path/Frameworks",
906+
"@loader_path/Frameworks",
907+
);
891908
PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
892909
PRODUCT_NAME = Elevate;
893910
SDKROOT = appletvos;
@@ -903,7 +920,11 @@
903920
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Developer";
904921
DEVELOPMENT_TEAM = "";
905922
INFOPLIST_FILE = Tests/Info.plist;
906-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
923+
LD_RUNPATH_SEARCH_PATHS = (
924+
"$(inherited)",
925+
"@executable_path/Frameworks",
926+
"@loader_path/Frameworks",
927+
);
907928
PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
908929
PRODUCT_NAME = ElevateTests;
909930
SDKROOT = appletvos;
@@ -917,7 +938,11 @@
917938
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Developer";
918939
DEVELOPMENT_TEAM = "";
919940
INFOPLIST_FILE = Tests/Info.plist;
920-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
941+
LD_RUNPATH_SEARCH_PATHS = (
942+
"$(inherited)",
943+
"@executable_path/Frameworks",
944+
"@loader_path/Frameworks",
945+
);
921946
PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
922947
PRODUCT_NAME = ElevateTests;
923948
SDKROOT = appletvos;
@@ -928,6 +953,7 @@
928953
isa = XCBuildConfiguration;
929954
buildSettings = {
930955
ALWAYS_SEARCH_USER_PATHS = NO;
956+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
931957
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
932958
CLANG_CXX_LIBRARY = "libc++";
933959
CLANG_ENABLE_MODULES = YES;
@@ -991,6 +1017,7 @@
9911017
isa = XCBuildConfiguration;
9921018
buildSettings = {
9931019
ALWAYS_SEARCH_USER_PATHS = NO;
1020+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
9941021
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
9951022
CLANG_CXX_LIBRARY = "libc++";
9961023
CLANG_ENABLE_MODULES = YES;
@@ -1057,10 +1084,15 @@
10571084
DYLIB_INSTALL_NAME_BASE = "@rpath";
10581085
INFOPLIST_FILE = Source/Info.plist;
10591086
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1060-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1087+
LD_RUNPATH_SEARCH_PATHS = (
1088+
"$(inherited)",
1089+
"@executable_path/Frameworks",
1090+
"@loader_path/Frameworks",
1091+
);
10611092
PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
10621093
PRODUCT_NAME = Elevate;
10631094
SKIP_INSTALL = YES;
1095+
SWIFT_VERSION = 5.0;
10641096
};
10651097
name = Debug;
10661098
};
@@ -1078,10 +1110,15 @@
10781110
ENABLE_TESTABILITY = NO;
10791111
INFOPLIST_FILE = Source/Info.plist;
10801112
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1081-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1113+
LD_RUNPATH_SEARCH_PATHS = (
1114+
"$(inherited)",
1115+
"@executable_path/Frameworks",
1116+
"@loader_path/Frameworks",
1117+
);
10821118
PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
10831119
PRODUCT_NAME = Elevate;
10841120
SKIP_INSTALL = YES;
1121+
SWIFT_VERSION = 5.0;
10851122
};
10861123
name = Release;
10871124
};
@@ -1092,9 +1129,14 @@
10921129
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
10931130
DEVELOPMENT_TEAM = "";
10941131
INFOPLIST_FILE = Tests/Info.plist;
1095-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1132+
LD_RUNPATH_SEARCH_PATHS = (
1133+
"$(inherited)",
1134+
"@executable_path/Frameworks",
1135+
"@loader_path/Frameworks",
1136+
);
10961137
PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
10971138
PRODUCT_NAME = ElevateTests;
1139+
SWIFT_VERSION = 5.0;
10981140
};
10991141
name = Debug;
11001142
};
@@ -1105,9 +1147,14 @@
11051147
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
11061148
DEVELOPMENT_TEAM = "";
11071149
INFOPLIST_FILE = Tests/Info.plist;
1108-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1150+
LD_RUNPATH_SEARCH_PATHS = (
1151+
"$(inherited)",
1152+
"@executable_path/Frameworks",
1153+
"@loader_path/Frameworks",
1154+
);
11091155
PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
11101156
PRODUCT_NAME = ElevateTests;
1157+
SWIFT_VERSION = 5.0;
11111158
};
11121159
name = Release;
11131160
};
@@ -1126,7 +1173,11 @@
11261173
FRAMEWORK_VERSION = A;
11271174
INFOPLIST_FILE = Source/Info.plist;
11281175
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1129-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1176+
LD_RUNPATH_SEARCH_PATHS = (
1177+
"$(inherited)",
1178+
"@executable_path/../Frameworks",
1179+
"@loader_path/Frameworks",
1180+
);
11301181
PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
11311182
PRODUCT_NAME = Elevate;
11321183
SDKROOT = macosx;
@@ -1150,7 +1201,11 @@
11501201
FRAMEWORK_VERSION = A;
11511202
INFOPLIST_FILE = Source/Info.plist;
11521203
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1153-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1204+
LD_RUNPATH_SEARCH_PATHS = (
1205+
"$(inherited)",
1206+
"@executable_path/../Frameworks",
1207+
"@loader_path/Frameworks",
1208+
);
11541209
PRODUCT_BUNDLE_IDENTIFIER = com.nike.Elevate;
11551210
PRODUCT_NAME = Elevate;
11561211
SDKROOT = macosx;
@@ -1166,7 +1221,11 @@
11661221
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
11671222
COMBINE_HIDPI_IMAGES = YES;
11681223
INFOPLIST_FILE = Tests/Info.plist;
1169-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1224+
LD_RUNPATH_SEARCH_PATHS = (
1225+
"$(inherited)",
1226+
"@executable_path/../Frameworks",
1227+
"@loader_path/../Frameworks",
1228+
);
11701229
PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
11711230
PRODUCT_NAME = ElevateTests;
11721231
SDKROOT = macosx;
@@ -1181,7 +1240,11 @@
11811240
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
11821241
COMBINE_HIDPI_IMAGES = YES;
11831242
INFOPLIST_FILE = Tests/Info.plist;
1184-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1243+
LD_RUNPATH_SEARCH_PATHS = (
1244+
"$(inherited)",
1245+
"@executable_path/../Frameworks",
1246+
"@loader_path/../Frameworks",
1247+
);
11851248
PRODUCT_BUNDLE_IDENTIFIER = com.nike.ElevateTests;
11861249
PRODUCT_NAME = ElevateTests;
11871250
SDKROOT = macosx;

‎Elevate.xcodeproj/xcshareddata/xcschemes/Elevate iOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Elevate.xcodeproj/xcshareddata/xcschemes/Elevate macOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Elevate.xcodeproj/xcshareddata/xcschemes/Elevate tvOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Elevate.xcodeproj/xcshareddata/xcschemes/Elevate watchOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Gemfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1+
#
2+
# Gemfile
3+
# Elevate
4+
#
5+
# Created by Dmitri Fuerle on 4/30/19.
6+
# Copyright © 2019 Nike. All rights reserved.
7+
#
8+
19
source "https://rubygems.org"
210

3-
gem "cocoapods", "~> 1.6.0.beta.1"
11+
gem "cocoapods", "~> 1.7.0.beta.3"
412
gem "xcpretty"

0 commit comments

Comments
 (0)