From dab54c08162afee5e59ac08421944c259ab9f0ae Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Fri, 29 Mar 2019 00:02:07 +0900 Subject: [PATCH 1/6] Migrate with Xcode10.2 --- VueFlux.xcodeproj/project.pbxproj | 7 ++++--- VueFluxReactive/SignalOperators.swift | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/VueFlux.xcodeproj/project.pbxproj b/VueFlux.xcodeproj/project.pbxproj index 710ca6e..3a8ceb2 100644 --- a/VueFlux.xcodeproj/project.pbxproj +++ b/VueFlux.xcodeproj/project.pbxproj @@ -357,16 +357,16 @@ TargetAttributes = { 6B9E32801FA639DF000B24D4 = { CreatedOnToolsVersion = 9.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; }; 6B9E32891FA639DF000B24D4 = { CreatedOnToolsVersion = 9.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; }; 6B9EB2251FCB157C009F0659 = { - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; }; }; @@ -377,6 +377,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 6B9E32771FA639DF000B24D4; productRefGroup = 6B9E32821FA639DF000B24D4 /* Products */; diff --git a/VueFluxReactive/SignalOperators.swift b/VueFluxReactive/SignalOperators.swift index 395b992..f29523d 100644 --- a/VueFluxReactive/SignalOperators.swift +++ b/VueFluxReactive/SignalOperators.swift @@ -7,7 +7,7 @@ public extension Signal { /// - transform: A function that to transform each values to a new value. /// /// - Returns: A signal to be receives new values. - public func map(_ transform: @escaping (Value) -> T) -> Signal { + func map(_ transform: @escaping (Value) -> T) -> Signal { return operated { value, send in send(transform(value)) } @@ -19,7 +19,7 @@ public extension Signal { /// - executor: A executor to forward events on. /// /// - returns: A signal that will forward values on given executor. - public func observe(on executor: Executor) -> Signal { + func observe(on executor: Executor) -> Signal { return operated { value, send in executor.execute { send(value) } } From a0507cccd1b2ef6c680c0710cfa9e87b61cda360 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Fri, 29 Mar 2019 00:05:48 +0900 Subject: [PATCH 2/6] Update travis CI setting --- .travis.yml | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46d9d5f..8d8dbfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,21 @@ -env: - global: - - LC_CTYPE=en_US.UTF-8 +aliases: + - &testing_xcode + os: osx + language: objective-c + script: + - set -o pipefail + - xcodebuild build-for-testing test-without-building -scheme VueFlux -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c + - xcodebuild build-for-testing test-without-building -scheme VueFlux -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X' ENABLE_TESTABILITY=YES | xcpretty - c + - xcodebuild build-for-testing test-without-building -scheme VueFlux -configuration Release -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV' ENABLE_TESTABILITY=YES | xcpretty -c + - xcodebuild build -scheme VueFlux -configuration Release -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch Series 4 - 40mm' ENABLE_TESTABILITY=YES | xcpretty -c + matrix: include: - - os: osx - language: objective-c - osx_image: xcode10 - before_install: - - ./scripts/install_swiftlint.sh - script: - - swiftlint - - set -o pipefail - - xcodebuild build-for-testing test-without-building -scheme VueFlux -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c - - xcodebuild build-for-testing test-without-building -scheme VueFlux -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8' ENABLE_TESTABILITY=YES | xcpretty - c - - xcodebuild build-for-testing test-without-building -scheme VueFlux -configuration Release -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV' ENABLE_TESTABILITY=YES | xcpretty -c - - xcodebuild build -scheme VueFlux -configuration Release -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch - 38mm' ENABLE_TESTABILITY=YES | xcpretty -c - - os: osx - language: objective-c - osx_image: xcode9.4 - script: - - set -o pipefail - - xcodebuild build -scheme VueFlux -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8' ENABLE_TESTABILITY=YES | xcpretty - c + - <<: *testing_xcode + osx_image: xcode10.1 + + - <<: *testing_xcode + osx_image: xcode10.2 + notifications: - email: false + email: false \ No newline at end of file From c0af17531e86730477ce22ae643c051255462f68 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Fri, 29 Mar 2019 00:18:05 +0900 Subject: [PATCH 3/6] Update gems --- Gemfile | 2 +- Gemfile.lock | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 827cb05..aaba17d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem 'cocoapods', '1.6.0.beta.1' +gem 'cocoapods', '1.6.1' diff --git a/Gemfile.lock b/Gemfile.lock index 2505974..3ed519b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,19 +2,19 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.10) + activesupport (4.2.11.1) 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.6.0.beta.1) + cocoapods (1.6.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.6.0.beta.1) + cocoapods-core (= 1.6.1) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.1, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) @@ -22,30 +22,30 @@ GEM cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.2) - xcodeproj (>= 1.6.0, < 2.0) - cocoapods-core (1.6.0.beta.1) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) + cocoapods-core (1.6.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.1) + cocoapods-deintegrate (1.0.4) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) + cocoapods-stats (1.1.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.5) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -55,11 +55,11 @@ GEM nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.3.1) + ruby-macho (1.4.0) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.6.0) + xcodeproj (1.8.2) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -70,7 +70,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.6.0.beta.1) + cocoapods (= 1.6.1) BUNDLED WITH - 1.16.5 + 1.17.1 From 6a90be5e662173ab09a19fe4c9cf273e3e8e6005 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Fri, 29 Mar 2019 00:19:43 +0900 Subject: [PATCH 4/6] Update podspec --- VueFlux.podspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/VueFlux.podspec b/VueFlux.podspec index 014de75..de000a0 100644 --- a/VueFlux.podspec +++ b/VueFlux.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'VueFlux' - spec.version = '1.5.0' + spec.version = '1.6.0' spec.author = { 'ra1028' => 'r.fe51028.r@gmail.com' } spec.homepage = 'https://github.com/ra1028/VueFlux' spec.summary = 'Unidirectional State Management for Swift - Inspired by Vuex and Flux' @@ -12,4 +12,5 @@ Pod::Spec.new do |spec| spec.ios.deployment_target = '9.0' spec.watchos.deployment_target = '2.0' spec.tvos.deployment_target = "9.0" + spec.swift_version = '4.2' end From 1c34405dbb120cfbea3a62b7a46a158f74311a40 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Fri, 29 Mar 2019 00:21:46 +0900 Subject: [PATCH 5/6] Update swiftlint config --- .swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 2bf3dfa..da4339a 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,6 +1,6 @@ excluded: - Tests - - Examples/RxExample/Carthage + - Examples disabled_rules: - multiple_closures_with_trailing_closure From 74b4e1e898c5bb3c1a38da156a54cfc9e36407a3 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Fri, 29 Mar 2019 00:23:42 +0900 Subject: [PATCH 6/6] Migrate example with Xcode10.2 --- Example/Example.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index a2d6be0..6976d15 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -181,7 +181,7 @@ TargetAttributes = { 6BEDA5E11FBA1DFE00F03699 = { CreatedOnToolsVersion = 9.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; }; };