Merge pull request #4 from OpenShelter/feature/swift3

Release 0.1.0

.travis.yml

@@ -1,21 +1,20 @@
 language: objective-c
-osx_image: xcode7.3
+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

Cartfile

@@ -1 +1 @@
-github "typelift/Swiftz" ~> 0.5.1
+github "typelift/Swiftz" ~> 0.6.2

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

@@ -786,9 +786,11 @@
 					};
 					DE702D0E1BFB28E20017CEE8 = {
 						CreatedOnToolsVersion = 7.1.1;
+						LastSwiftMigration = 0810;
 					};
 					DE702D171BFB28E30017CEE8 = {
 						CreatedOnToolsVersion = 7.1.1;
+						LastSwiftMigration = 0810;
 					};
 				};
 			};
@@ -1277,10 +1279,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 +1292,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";
@@ -1396,7 +1390,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1440,8 +1434,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1470,6 +1463,7 @@
 				PRODUCT_NAME = Tyro;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1493,6 +1487,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Tyro;
 				PRODUCT_NAME = Tyro;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -1505,7 +1500,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";
@@ -1525,7 +1519,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";
@@ -1553,6 +1546,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1574,6 +1568,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -1589,6 +1584,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.typelift.TyroTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1604,6 +1600,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.typelift.TyroTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Tyro/Date.swift

@@ -10,29 +10,29 @@ import Foundation
 import Swiftz
 
 public struct DateTimestampJSONConverter : FromJSON, ToJSON {
-    public typealias T = NSDate
+    public typealias T = Date
 
-    private init() {}
+    fileprivate init() {}
 
-    public static func fromJSON(value : JSONValue) -> Either<JSONError, NSDate> {
+    public static func fromJSON(_ value : JSONValue) -> Either<JSONError, Date> {
         switch value {
         case .Number(let value):
-            let date = NSDate(timeIntervalSince1970 : value.doubleValue / 1000.0)
+            let date = Date(timeIntervalSince1970 : value.doubleValue / 1000.0)
             return .Right(date)
         default:
-            return .Left(.TypeMismatch("NSDate timestamp", "\(value.dynamicType.self)"))
+            return .Left(.TypeMismatch("Date timestamp", "\(type(of: value).self)"))
         }
     }
 
-    public static func toJSON(date : NSDate) -> Either<JSONError, JSONValue> {
-        return .Right(.Number(NSNumber(unsignedLongLong : UInt64(date.timeIntervalSince1970 * 1000.0))))
+    public static func toJSON(_ date : Date) -> Either<JSONError, JSONValue> {
+        return .Right(.Number(NSNumber(value : UInt64(date.timeIntervalSince1970 * 1000.0))))
     }
 }
 
 public struct DateTimestampJSONFormatter : JSONFormatterType {
     public typealias T = DateTimestampJSONConverter.T
 
-    public private(set) var jsonValue : JSONValue?
+    public fileprivate(set) var jsonValue : JSONValue?
 
     public init(_ jsonValue : JSONValue?) {
         self.jsonValue = jsonValue
@@ -42,50 +42,50 @@ public struct DateTimestampJSONFormatter : JSONFormatterType {
         jsonValue = nil
     }
 
-    public func decodeEither(value : JSONValue) -> Either<JSONError, T> {
+    public func decodeEither(_ value : JSONValue) -> Either<JSONError, T> {
         return DateTimestampJSONConverter.fromJSON(value)
     }
 
-    public func encodeEither(value : T) -> Either<JSONError, JSONValue> {
+    public func encodeEither(_ value : T) -> Either<JSONError, JSONValue> {
         return DateTimestampJSONConverter.toJSON(value)
     }
 }
 
 public struct DateFormatJSONFormatter : JSONFormatterType {
-    public typealias T = NSDate
+    public typealias T = Date
 
     public let dateFormat : String
 
     public static let DefaultDateFormat = "yyyy'-'MM'-'dd HH':'mm':'ss ZZZ"
 
-    public private(set) var jsonValue : JSONValue?
+    public fileprivate(set) var jsonValue : JSONValue?
 
     public init(_ jsonValue : JSONValue?, _ dateFormat : String = DateFormatJSONFormatter.DefaultDateFormat) {
         self.dateFormat = dateFormat
         self.jsonValue = jsonValue
     }
 
-    public func decodeEither(value : JSONValue) -> Either<JSONError, T> {
+    public func decodeEither(_ value : JSONValue) -> Either<JSONError, T> {
         switch value {
         case .String(let value):
-            let formatter = NSDateFormatter()
+            let formatter = DateFormatter()
             formatter.dateFormat = dateFormat
-            let date = formatter.dateFromString(value)
+            let date = formatter.date(from: value)
             if let date = date {
                 return .Right(date)
             }
             else {
                 return .Left(.Custom("Could not format value (\(value)) to format (\(formatter.dateFormat))"))
             }
         default:
-            return .Left(.TypeMismatch("NSDate format", "\(value.dynamicType.self)"))
+            return .Left(.TypeMismatch("Date format", "\(type(of: value).self)"))
         }
     }
 
-    public func encodeEither(value : T) -> Either<JSONError, JSONValue> {
-        let formatter = NSDateFormatter()
+    public func encodeEither(_ value : T) -> Either<JSONError, JSONValue> {
+        let formatter = DateFormatter()
         formatter.dateFormat = dateFormat
-        let string = formatter.stringFromDate(value)
+        let string = formatter.string(from: value)
         return .Right(.String(string))
     }
 }

Tyro/DecimalNumber.swift

@@ -12,36 +12,38 @@ import Swiftz
 public struct DecimalNumberJSONConverter : FromJSON, ToJSON {
     public typealias T = NSDecimalNumber
 
-    private init() {}
+    fileprivate init() {}
 
-    public static func fromJSON(value : JSONValue) -> Either<JSONError, NSDecimalNumber> {
+    public static func fromJSON(_ value : JSONValue) -> Either<JSONError, NSDecimalNumber> {
         switch value {
         case .Number(let n):
             return .Right(NSDecimalNumber(decimal : n.decimalValue))
         default:
-            return .Left(.TypeMismatch("NSDecimalNumber JSON", "\(value.dynamicType.self)"))
+            return .Left(.TypeMismatch("DecimalNumber JSON", "\(type(of: value).self)"))
         }
     }
 
-    public static func toJSON(dn : NSDecimalNumber) -> Either<JSONError, JSONValue> {
+    public static func toJSON(_ dn : NSDecimalNumber) -> Either<JSONError, JSONValue> {
         return .Right(.Number(dn))
     }
 }
 
 public struct DecimalNumberJSONFormatter : JSONFormatterType {
+
     public typealias T = DecimalNumberJSONConverter.T
 
-    public private(set) var jsonValue : JSONValue?
+    public fileprivate(set) var jsonValue : JSONValue?
 
     public init(_ jsonValue : JSONValue?) {
         self.jsonValue = jsonValue
     }
 
-    public func decodeEither(value : JSONValue) -> Either<JSONError, T> {
+    public func decodeEither(_ value : JSONValue) -> Either<JSONError, T> {
         return DecimalNumberJSONConverter.fromJSON(value)
     }
 
-    public func encodeEither(value : T) -> Either<JSONError, JSONValue> {
+    public func encodeEither(_ value : T) -> Either<JSONError, JSONValue> {
         return DecimalNumberJSONConverter.toJSON(value)
     }
+
 }

Tyro/Decoder.swift

@@ -11,38 +11,39 @@ import Swiftz
 
 public protocol JSONDecoderType {
     associatedtype DecodedType = AnyObject
-    func decodeEither(value : JSONValue) -> Either<JSONError, DecodedType>
-    func decode(value : JSONValue) -> DecodedType?
+    func decodeEither(_ value : JSONValue) -> Either<JSONError, DecodedType>
+    func decode(_ value : JSONValue) -> DecodedType?
 }
 
 public class JSONDecoder : JSONDecoderType {
     public static let decoder = JSONDecoder()
-    private init() {}
+    fileprivate init() {}
 
-    public func decodeEither(value : JSONValue) -> Either<JSONError, AnyObject> {
+    public func decodeEither(_ value : JSONValue) -> Either<JSONError, AnyObject> {
         switch value {
         case .Array(let values):
-            return .Right(values.flatMap { $0.anyObject })
+
+            return Either.Right( values.flatMap{ $0.anyObject } as AnyObject )
         case .Object(let value):
-            return .Right(value.mapMaybe { $0.anyObject })
+            return .Right(value.mapMaybe{ $0.anyObject } as AnyObject)
         case .Number(let n):
             return .Right(n)
         case .String(let s):
-            return .Right(s)
+            return .Right(s as AnyObject)
         case .Null:
             return .Right(NSNull())
         }
     }
 }
 
 extension JSONDecoderType {
-    public func decode(value : JSONValue) -> DecodedType? {
+    public func decode(_ value : JSONValue) -> DecodedType? {
         return decodeEither(value).right
     }
 }
 
 extension JSONValue : JSONDecoderType {
-    public func decodeEither(value : JSONValue) -> Either<JSONError, JSONValue> {
+    public func decodeEither(_ value : JSONValue) -> Either<JSONError, JSONValue> {
         return jsonValue.toEither(.Custom("Could not decode JSONValue from JSONValue. There must be a problem."))
     }
 }