From 60b3035b80cfaee5485795435db9262588c5f179 Mon Sep 17 00:00:00 2001 From: Yusuke Morishita Date: Sat, 12 Jan 2019 09:01:04 +0900 Subject: [PATCH] Support carthage binary to Swift 4.2.1 (#81) * Add binary json to support swift 4.2.1 * Bump to 0.9.2 * Update .travis.yml * Update dependencies * Fix README --- .travis.yml | 4 +- Cartfile | 2 +- Cartfile.resolved | 2 +- Example/Podfile.lock | 67 ++++++++++++------- .../project.pbxproj | 18 +---- Gemfile.lock | 50 +++++++------- Package.resolved | 4 +- Package.swift | 2 +- README.md | 10 +-- RxKeyboard.json | 5 +- RxKeyboard.podspec | 6 +- 11 files changed, 89 insertions(+), 81 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0f6ba5..3b921b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode10 +osx_image: xcode10.1 language: objective-c sudo: required env: @@ -12,7 +12,7 @@ env: - FRAMEWORK="RxKeyboard" matrix: - SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.0 DESTINATION="platform=iOS Simulator,name=iPhone 8" - - SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.2 DESTINATION="platform=iOS Simulator,name=iPhone 8" + - SDK="$IOS_SDK" TEST=0 SWIFT_VERSION=4.2.1 DESTINATION="platform=iOS Simulator,name=iPhone 8" install: - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)" diff --git a/Cartfile b/Cartfile index 6c7e3a8..f2ff805 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveX/RxSwift" ~> 4.3.1 +github "ReactiveX/RxSwift" ~> 4.4.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index b34f3f7..ce434dc 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ReactiveX/RxSwift" "4.3.1" +github "ReactiveX/RxSwift" "4.4.0" diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 0ccc4c8..6365417 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,20 +1,22 @@ PODS: - CGFloatLiteral (0.4.0) - ManualLayout (1.3.0) - - ReusableKit (2.0.1): - - ReusableKit/Core (= 2.0.1) - - ReusableKit/Core (2.0.1) - - RxCocoa (4.3.1): + - ReusableKit (2.1.0): + - ReusableKit/Core (= 2.1.0) + - ReusableKit/Core (2.1.0) + - RxAtomic (4.4.0) + - RxCocoa (4.4.0): - RxSwift (~> 4.0) - - RxKeyboard (0.8.3): - - RxCocoa (>= 4.3.0) - - RxSwift (>= 4.3.0) - - RxSwift (4.3.1) - - SnapKit (4.0.1) - - SwiftyColor (1.0.0) - - SwiftyImage (1.2.0) - - Then (2.3.0) - - UITextView+Placeholder (1.2.1) + - RxKeyboard (0.9.2): + - RxCocoa (>= 4.4.0) + - RxSwift (>= 4.4.0) + - RxSwift (4.4.0): + - RxAtomic (~> 4.4) + - SnapKit (4.2.0) + - SwiftyColor (1.1.0) + - SwiftyImage (1.3.0) + - Then (2.4.0) + - "UITextView+Placeholder (1.2.1)" DEPENDENCIES: - CGFloatLiteral @@ -25,25 +27,40 @@ DEPENDENCIES: - SwiftyColor - SwiftyImage - Then - - UITextView+Placeholder + - "UITextView+Placeholder" + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - CGFloatLiteral + - ManualLayout + - ReusableKit + - RxAtomic + - RxCocoa + - RxSwift + - SnapKit + - SwiftyColor + - SwiftyImage + - Then + - "UITextView+Placeholder" EXTERNAL SOURCES: RxKeyboard: - :path: ../ + :path: "../" SPEC CHECKSUMS: CGFloatLiteral: 2ab558b74124b584dd023a35b7e41795a61d8140 ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880 - ReusableKit: 11b5bde14553a35bcf3979412dbfd1e690392f14 - RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635 - RxKeyboard: cdc73085509a6baa5795038372d86260bb683bed - RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4 - SnapKit: 0de968a9fec17499afa29683b05d0c775b6d1c29 - SwiftyColor: 7fa09db14051bc5d7f539e1c4576665975225992 - SwiftyImage: ebaa7c7b6163cd4ad102f3bb05a8fb276d35b4f3 - Then: ee21c97b85ff6062b9b0080c9abb1eea46743345 - UITextView+Placeholder: 0c3efd97f37ea64bde7f34cc6e90fe02e87b3909 + ReusableKit: d0b040de03b293288b0ca27a78602691d3346d9b + RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f + RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749 + RxKeyboard: cb7bc1897aaaa36e86d36556de62418548751b96 + RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973 + SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a + SwiftyColor: f2955e3a947f4faef07162a289d326ba0662d667 + SwiftyImage: 62a73a6d8cafb83d7ebbf98795c6d1ad8666bf02 + Then: 71866660c7af35a7343831f7668e7cd2b62ee0f2 + "UITextView+Placeholder": 0c3efd97f37ea64bde7f34cc6e90fe02e87b3909 PODFILE CHECKSUM: 49cf5def62bcfa2dfbe0c5118a9372a4162ec992 -COCOAPODS: 1.3.1 +COCOAPODS: 1.5.3 diff --git a/Example/RxKeyboardExample.xcodeproj/project.pbxproj b/Example/RxKeyboardExample.xcodeproj/project.pbxproj index 9d3e72a..30ba7d9 100644 --- a/Example/RxKeyboardExample.xcodeproj/project.pbxproj +++ b/Example/RxKeyboardExample.xcodeproj/project.pbxproj @@ -149,7 +149,6 @@ 03E8A71B1E35A95B00F7A3EC /* Frameworks */, 03E8A71C1E35A95B00F7A3EC /* Resources */, E857CEA8F03D723AC93BD7A1 /* [CP] Embed Pods Frameworks */, - 2D555D8C90E50248DB41694D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -207,21 +206,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2D555D8C90E50248DB41694D /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxKeyboardExample/Pods-RxKeyboardExample-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; D103E37D22DD7DDCE369FBBB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -250,6 +234,7 @@ "${BUILT_PRODUCTS_DIR}/CGFloatLiteral/CGFloatLiteral.framework", "${BUILT_PRODUCTS_DIR}/ManualLayout/ManualLayout.framework", "${BUILT_PRODUCTS_DIR}/ReusableKit/ReusableKit.framework", + "${BUILT_PRODUCTS_DIR}/RxAtomic/RxAtomic.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", "${BUILT_PRODUCTS_DIR}/RxKeyboard/RxKeyboard.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", @@ -264,6 +249,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CGFloatLiteral.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ManualLayout.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReusableKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxKeyboard.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", diff --git a/Gemfile.lock b/Gemfile.lock index e87bce5..41d453a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,71 +1,73 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.5) + CFPropertyList (3.0.0) activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + atomos (0.1.3) claide (1.0.2) - cocoapods (1.3.1) + cocoapods (1.5.3) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.3.1) - cocoapods-deintegrate (>= 1.0.1, < 2.0) - cocoapods-downloader (>= 1.1.3, < 2.0) + cocoapods-core (= 1.5.3) + cocoapods-deintegrate (>= 1.0.2, < 2.0) + cocoapods-downloader (>= 1.2.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.2.0, < 2.0) + cocoapods-trunk (>= 1.3.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) fourflusher (~> 2.0.1) gh_inspector (~> 1.0) - molinillo (~> 0.5.7) + molinillo (~> 0.6.5) nap (~> 1.0) ruby-macho (~> 1.1) - xcodeproj (>= 1.5.1, < 2.0) - cocoapods-core (1.3.1) + xcodeproj (>= 1.5.7, < 2.0) + cocoapods-core (1.5.3) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.1) - cocoapods-downloader (1.1.3) + cocoapods-deintegrate (1.0.2) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) cocoapods-stats (1.0.0) - cocoapods-trunk (1.3.0) + cocoapods-trunk (1.3.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.3) escape (0.0.4) fourflusher (2.0.1) fuzzy_match (2.0.4) - gh_inspector (1.0.3) - i18n (0.9.0) + gh_inspector (1.1.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) - minitest (5.10.3) - molinillo (0.5.7) - nanaimo (0.2.3) + minitest (5.11.3) + molinillo (0.6.6) + nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.1.0) + ruby-macho (1.3.1) swiftproj (0.1.0) colored2 (>= 3.0) xcodeproj (>= 1.5) thread_safe (0.3.6) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.5.2) - CFPropertyList (~> 2.3.3) + xcodeproj (1.7.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.3) + nanaimo (~> 0.2.6) PLATFORMS ruby @@ -78,4 +80,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.15.3 + 1.16.6 diff --git a/Package.resolved b/Package.resolved index fbc3172..414a4e9 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", "state": { "branch": null, - "revision": "0df62b4d562f8620d4b795b18e4adf0b631527a1", - "version": "4.3.1" + "revision": "e8aa1d892a0d8a153a28b74cbad25be534926f49", + "version": "4.4.0" } } ] diff --git a/Package.swift b/Package.swift index b6781ae..76de260 100644 --- a/Package.swift +++ b/Package.swift @@ -8,7 +8,7 @@ let package = Package( .library(name: "RxKeyboard", targets: ["RxKeyboard"]), ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.3.0")), + .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.4.0")), ], targets: [ .target(name: "RxKeyboard", dependencies: ["RxSwift", "RxCocoa"]), diff --git a/README.md b/README.md index 43c6bfb..3d1425e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # RxKeyboard -![Swift](https://img.shields.io/badge/Swift-4.1-orange.svg) +![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg) [![CocoaPods](http://img.shields.io/cocoapods/v/RxKeyboard.svg)](https://cocoapods.org/pods/RxKeyboard) [![Build Status](https://travis-ci.org/RxSwiftCommunity/RxKeyboard.svg?branch=master)](https://travis-ci.org/RxSwiftCommunity/RxKeyboard) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) @@ -93,8 +93,8 @@ RxKeyboard.instance.frame ## Dependencies -- [RxSwift](https://github.com/ReactiveX/RxSwift) (>= 4.1.0) -- [RxCocoa](https://github.com/ReactiveX/RxSwift) (>= 4.1.0) +- [RxSwift](https://github.com/ReactiveX/RxSwift) (>= 4.4.0) +- [RxCocoa](https://github.com/ReactiveX/RxSwift) (>= 4.4.0) ## Requirements @@ -124,7 +124,9 @@ $ swift package generate-xcodeproj ``` ⚠️ With Carthage, RxKeyboard only supports binary installation: - + * 0.9.2 + * Xcode 10.1 (10B61) + * Swift 4.2.1 (swiftlang-1000.11.42 clang-1000.11.45.1) * 0.9.0 * Xcode 10 (10A255) * Swift 4.2 (swiftlang-1000.11.37.1 clang-1000.11.45.1) diff --git a/RxKeyboard.json b/RxKeyboard.json index 8487434..8ed2d5d 100644 --- a/RxKeyboard.json +++ b/RxKeyboard.json @@ -6,5 +6,6 @@ "0.8.2": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.8.2/RxKeyboard.framework.zip", "0.8.3": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.8.3/RxKeyboard.framework.zip", "0.9.0": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.0/RxKeyboard.framework.zip", - "0.9.1": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.1/RxKeyboard.framework.zip" -} + "0.9.1": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.1/RxKeyboard.framework.zip", + "0.9.2": "https://github.com/RxSwiftCommunity/RxKeyboard/releases/download/0.9.2/RxKeyboard.framework.zip" +} diff --git a/RxKeyboard.podspec b/RxKeyboard.podspec index 52393fa..888f3a6 100644 --- a/RxKeyboard.podspec +++ b/RxKeyboard.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RxKeyboard' - s.version = '0.9.1' + s.version = '0.9.2' s.summary = 'Reactive Keyboard in iOS' s.homepage = 'https://github.com/RxSwiftCommunity/RxKeyboard' s.license = { :type => 'MIT', :file => 'LICENSE' } @@ -11,8 +11,8 @@ Pod::Spec.new do |s| s.frameworks = 'UIKit', 'Foundation' s.requires_arc = true - s.dependency 'RxSwift', '>= 4.3.1' - s.dependency 'RxCocoa', '>= 4.3.1' + s.dependency 'RxSwift', '>= 4.4.0' + s.dependency 'RxCocoa', '>= 4.4.0' s.ios.deployment_target = '8.0' end