From c23973b1bac8019d60b7d990bb4172eebe34f1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Tue, 25 Apr 2017 19:04:10 +0800 Subject: [PATCH 1/9] Use correct version of SwiftCheck --- Carthage/Checkouts/SwiftCheck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Carthage/Checkouts/SwiftCheck b/Carthage/Checkouts/SwiftCheck index e07a71a..0e2d31c 160000 --- a/Carthage/Checkouts/SwiftCheck +++ b/Carthage/Checkouts/SwiftCheck @@ -1 +1 @@ -Subproject commit e07a71a07d2b252ea1b47d9a091b5bc6dec3fb07 +Subproject commit 0e2d31cbf718cc31bb2f80a65760439ecc3ee7fc From 2f81a9cc32a5866079bc0c91490aa75130f61a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Tue, 25 Apr 2017 19:04:28 +0800 Subject: [PATCH 2/9] Specify swift version 3.0 --- Tyro.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tyro.xcodeproj/project.pbxproj b/Tyro.xcodeproj/project.pbxproj index f47d23d..1042fb5 100644 --- a/Tyro.xcodeproj/project.pbxproj +++ b/Tyro.xcodeproj/project.pbxproj @@ -1392,6 +1392,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 +1434,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"; From 5449d3592cafa80e4b27b597fe48d86a5241c3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Tue, 25 Apr 2017 19:12:43 +0800 Subject: [PATCH 3/9] Changed travis CI image --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1252ded..7d1a781 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8.0 +osx_image: xcode8.2 git: submodules: false before_install: From 38405825d260e94ba6724a5fe133fa22eca6ba54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Tue, 25 Apr 2017 19:12:54 +0800 Subject: [PATCH 4/9] Update quickly readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bb10765..eede078 100644 --- a/README.md +++ b/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). From aa7576128fb7500ec27ccd481174243f5859a12d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Tue, 25 Apr 2017 19:58:08 +0800 Subject: [PATCH 5/9] Remove notifications when travis-ci runs --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d1a781..3c9d565 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,3 @@ script: - 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 From 5e2d6a952970129476a1e412577a6f9e2e779ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Wed, 26 Apr 2017 17:23:36 +0800 Subject: [PATCH 6/9] Automate release of Cocoapods spec on tag https://fuller.li/posts/automated-cocoapods-releases-with-ci/ --- .travis.yml | 5 +++++ scripts/push.sh | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 scripts/push.sh diff --git a/.travis.yml b/.travis.yml index 3c9d565..6f39019 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,3 +12,8 @@ script: - 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 +deploy: + provider: script + script: ./scripts/push.sh + on: + tags: true diff --git a/scripts/push.sh b/scripts/push.sh new file mode 100644 index 0000000..90ef3b3 --- /dev/null +++ b/scripts/push.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +source ~/.rvm/scripts/rvm +rvm use default +pod trunk push \ No newline at end of file From 4141922f53f8176317d718c33e17197c45ce5045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Thu, 27 Apr 2017 14:20:38 +0800 Subject: [PATCH 7/9] Remove warning --- Tyro.xcodeproj/project.pbxproj | 10 ---------- TyroTests/JSONValueSpec.swift | 2 -- 2 files changed, 12 deletions(-) diff --git a/Tyro.xcodeproj/project.pbxproj b/Tyro.xcodeproj/project.pbxproj index 1042fb5..f59721e 100644 --- a/Tyro.xcodeproj/project.pbxproj +++ b/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"; @@ -1498,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"; @@ -1518,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"; diff --git a/TyroTests/JSONValueSpec.swift b/TyroTests/JSONValueSpec.swift index 478a9c2..a063de0 100644 --- a/TyroTests/JSONValueSpec.swift +++ b/TyroTests/JSONValueSpec.swift @@ -63,8 +63,6 @@ extension JSONValue : Arbitrary { return Gen.pure(JSONValue.Null) } } - - fatalError() } } From 1be394ecf93872ce5a18336b242bfec1760ebc2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Thu, 27 Apr 2017 14:22:02 +0800 Subject: [PATCH 8/9] Update Podspec Note will failed until Swiftz publish its spec. See https://github.com/typelift/Swiftz/issues/327 --- Tyro.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tyro.podspec b/Tyro.podspec index 4dd1f75..97a2241 100644 --- a/Tyro.podspec +++ b/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" => "devteam.codafi@gmail.com", "pthariensflame" => "alexanderaltman@me.com", "mpurland" => "m.purland@gmail.com" } @@ -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 From 4c4c6cd96e5c0ae1b2356e0a67fff4fbfdf24cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Benaiteau?= Date: Thu, 27 Apr 2017 16:46:03 +0800 Subject: [PATCH 9/9] Disable cocoapods for now --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6f39019..1f423f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,15 @@ 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 -deploy: - provider: script - script: ./scripts/push.sh - on: - tags: true +# deploy: +# provider: script +# script: ./scripts/push.sh +# on: +# tags: true