Merge pull request #214 from bignerdranch/swift3

Update to Swift 3.0

.gitignore

@@ -35,3 +35,6 @@ Packages/
 
 # Carthage
 Carthage/Build
+report.xml
+fastlane/test_output
+fastlane/build_output

.ruby-version

@@ -0,0 +1 @@
+2.2.1

.travis.yml

@@ -1,22 +1,12 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8
+cache: bundler
+rvm: 2.2.1
 install:
-- gem install xcpretty --no-rdoc --no-ri --no-document
-- gem install jazzy --no-rdoc --no-ri --no-document
-- curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.11/Carthage.pkg"
-- sudo installer -pkg "Carthage.pkg" -target /
-- rm "Carthage.pkg"
+  - bundle install
+  - brew outdated carthage || brew upgrade carthage
 script:
-- open -b com.apple.iphonesimulator # Travis CI workaround
-- set -o pipefail && xcodebuild test -scheme 'Freddy' -sdk macosx | xcpretty -c
-- set -o pipefail && xcodebuild test -scheme 'MobileFreddy' -sdk iphonesimulator -destination
-  'platform=iOS Simulator,name=iPhone 5' | xcpretty -c
-- set -o pipefail && xcodebuild test -scheme 'TVFreddy' -sdk appletvsimulator -destination
-  'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c
-- carthage build --no-skip-current
-- pod lib lint --quick
-after_success:
-- "./Configurations/publish_docs.sh"
+  - bundle exec fastlane travis
 notifications:
   slack:
     secure: VHcEZcTuVR3gfHIcM9jcxrXgE3tkVIT4gWDLpnK7O4em86dCpaVkLDwr0UcQYxvqGS1J8pQqGZCwyOBsdgaItX52eRDMIez/384B56Vl6eufdLAcwWELIEtHyFkJ6XUjmASICaeeb8SpF/rj89/AXoHU6c8shY13NKtoBBZCGq8=

Configurations/Base.xcconfig

@@ -26,8 +26,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
 GCC_WARN_UNDECLARED_SELECTOR = YES
 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
+CLANG_WARN_INFINITE_RECURSION = YES
+CLANG_WARN_SUSPICIOUS_MOVE = YES
 
-CURRENT_PROJECT_VERSION = 2.1.0
+CURRENT_PROJECT_VERSION = 3.0.0
 VERSION_INFO_PREFIX =
 VERSIONING_SYSTEM = apple-generic
 
@@ -39,8 +41,9 @@ TVOS_DEPLOYMENT_TARGET = 9.0
 ENABLE_BITCODE = YES
 ENABLE_BITCODE[sdk=macosx*] = NO
 
-CODE_SIGN_IDENTITY[sdk=macosx*] = -
-CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
-CODE_SIGN_IDENTITY[sdk=appletvos*] = iPhone Developer
+CODE_SIGN_IDENTITY[sdk=macosx*] =
+CODE_SIGN_IDENTITY[sdk=iphoneos*] =
+CODE_SIGN_IDENTITY[sdk=appletvos*] =
+CODE_SIGN_IDENTITY[sdk=watchos*] =
 
-SWIFT_VERSION = 2.3
+SWIFT_VERSION = 3.0

Freddy.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Freddy"
-  s.version      = "2.1.0"
+  s.version      = "3.0.0"
   s.summary      = "A JSON parsing library written in Swift"
 
   s.description  = <<-DESC
@@ -28,5 +28,5 @@ Pod::Spec.new do |s|
   s.source_files  = "Sources/**/*.{h,swift}"
 
   s.requires_arc = true
-
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.0' }
 end

Freddy.xcodeproj/project.pbxproj

@@ -70,6 +70,12 @@
 		DB6ADFC71C23631500D77BF1 /* sampleNoWhiteSpace.JSON in Resources */ = {isa = PBXBuildFile; fileRef = DB6ADFC21C23631500D77BF1 /* sampleNoWhiteSpace.JSON */; };
 		DB6ADFC81C23631500D77BF1 /* sampleNoWhiteSpace.JSON in Resources */ = {isa = PBXBuildFile; fileRef = DB6ADFC21C23631500D77BF1 /* sampleNoWhiteSpace.JSON */; };
 		DC194EB91C47D87B001D4569 /* JSONTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC194EB81C47D87B001D4569 /* JSONTests.swift */; };
+		DC5F54FB1D82E79400670855 /* JSONTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC194EB81C47D87B001D4569 /* JSONTests.swift */; };
+		DC5F54FC1D82E79500670855 /* JSONTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC194EB81C47D87B001D4569 /* JSONTests.swift */; };
+		DC5F54FD1D82E79900670855 /* JSONEncodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C72A1C3B32A6003D5A05 /* JSONEncodableTests.swift */; };
+		DC5F54FE1D82E79A00670855 /* JSONEncodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C67C72A1C3B32A6003D5A05 /* JSONEncodableTests.swift */; };
+		DC5F54FF1D82E79F00670855 /* JSONSubscriptingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C7BD51E1C7A4B9300A6ED4B /* JSONSubscriptingTests.swift */; };
+		DC5F55001D82E7A000670855 /* JSONSubscriptingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C7BD51E1C7A4B9300A6ED4B /* JSONSubscriptingTests.swift */; };
 		E43B67DB1C59598700ACE390 /* JSONEncodingDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = E43B67DA1C59598700ACE390 /* JSONEncodingDetector.swift */; };
 		E43B67DC1C59598700ACE390 /* JSONEncodingDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = E43B67DA1C59598700ACE390 /* JSONEncodingDetector.swift */; };
 		E43B67DD1C59598700ACE390 /* JSONEncodingDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = E43B67DA1C59598700ACE390 /* JSONEncodingDetector.swift */; };
@@ -451,14 +457,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Big Nerd Ranch";
 				TargetAttributes = {
 					DB6ADF1E1C23610B00D77BF1 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 					DB6ADF281C23610B00D77BF1 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 					DB6ADF3D1C23612000D77BF1 = {
 						CreatedOnToolsVersion = 7.2;
@@ -585,8 +593,11 @@
 				DB6ADFB51C2362FF00D77BF1 /* JSONParserTests.swift in Sources */,
 				E43B67E11C5962CD00ACE390 /* JSONEncodingDetectorTests.swift in Sources */,
 				3F70EA991C6D0EC500972CEB /* JSONSerializingTests.swift in Sources */,
+				DC5F54FF1D82E79F00670855 /* JSONSubscriptingTests.swift in Sources */,
 				DB6ADFBB1C2362FF00D77BF1 /* JSONTypeTests.swift in Sources */,
+				DC5F54FD1D82E79900670855 /* JSONEncodableTests.swift in Sources */,
 				DB6ADFB21C2362FF00D77BF1 /* JSONDecodableTests.swift in Sources */,
+				DC5F54FB1D82E79400670855 /* JSONTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -646,8 +657,11 @@
 				DB6ADFB61C2362FF00D77BF1 /* JSONParserTests.swift in Sources */,
 				E43B67E21C5962CD00ACE390 /* JSONEncodingDetectorTests.swift in Sources */,
 				3F70EA9A1C6D0EC500972CEB /* JSONSerializingTests.swift in Sources */,
+				DC5F55001D82E7A000670855 /* JSONSubscriptingTests.swift in Sources */,
 				DB6ADFBC1C2362FF00D77BF1 /* JSONTypeTests.swift in Sources */,
+				DC5F54FE1D82E79A00670855 /* JSONEncodableTests.swift in Sources */,
 				DB6ADFB31C2362FF00D77BF1 /* JSONDecodableTests.swift in Sources */,
+				DC5F54FC1D82E79500670855 /* JSONTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -745,6 +759,7 @@
 			baseConfigurationReference = DB6ADF811C23617500D77BF1 /* Framework.xcconfig */;
 			buildSettings = {
 				SDKROOT = macosx;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -753,6 +768,7 @@
 			baseConfigurationReference = DB6ADF811C23617500D77BF1 /* Framework.xcconfig */;
 			buildSettings = {
 				SDKROOT = macosx;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -761,6 +777,7 @@
 			baseConfigurationReference = DB6ADF831C23617500D77BF1 /* Tests.xcconfig */;
 			buildSettings = {
 				SDKROOT = macosx;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -769,6 +786,7 @@
 			baseConfigurationReference = DB6ADF831C23617500D77BF1 /* Tests.xcconfig */;
 			buildSettings = {
 				SDKROOT = macosx;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Freddy.xcodeproj/xcshareddata/xcschemes/Freddy.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Freddy.xcodeproj/xcshareddata/xcschemes/MobileFreddy.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Freddy.xcodeproj/xcshareddata/xcschemes/NanoFreddy.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Freddy.xcodeproj/xcshareddata/xcschemes/TVFreddy.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+ruby '2.2.1'
+
+gem 'fastlane'
+gem 'cocoapods'
+gem 'xcpretty'
+gem 'jazzy'