From 238d84e7d6b6ea22fb2cb45317468accd2c99fa3 Mon Sep 17 00:00:00 2001 From: Hovak Davtyan Date: Thu, 23 May 2019 18:01:17 +0400 Subject: [PATCH 1/7] Version 0.1.5 -Update Swift to 5 -Update RxSwift to 5 --- .swift-version | 1 - .travis.yml | 4 +- Example/Podfile | 4 +- Example/Podfile.lock | 34 +++++++++----- Example/STDevRxExt.xcodeproj/project.pbxproj | 43 +++++++----------- .../xcschemes/STDevRxExt-Example.xcscheme | 2 +- README.md | 6 +-- STDevRxExt.podspec | 9 ++-- STDevRxExt/Classes/CastExtensions.swift | 6 +-- STDevRxExt/Classes/FilterExtensions.swift | 44 +++++++++---------- STDevRxExt/Classes/MapExtensions.swift | 8 ++-- STDevRxExt/Classes/OtherExtensions.swift | 4 +- 12 files changed, 82 insertions(+), 83 deletions(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 5186d07..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.0 diff --git a/.travis.yml b/.travis.yml index 82b0c8e..9c81c54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # * http://www.objc.io/issue-6/travis-ci.html # * https://github.com/supermarin/xcpretty#usage -osx_image: xcode9.2 +osx_image: xcode10.2 language: swift cache: cocoapods podfile: Example/Podfile @@ -10,7 +10,7 @@ before_install: - gem install cocoapods # Since Travis is not always on latest version - pod install --project-directory=Example --repo-update script: -- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' ONLY_ACTIVE_ARCH=NO | xcpretty +- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 8,OS=10.0' ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint notifications: email: diff --git a/Example/Podfile b/Example/Podfile index 548d2c4..312192c 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '9.3' +platform :ios, '10.0' use_frameworks! @@ -6,4 +6,4 @@ target 'STDevRxExt_Tests' do pod 'STDevRxExt', :path => '../' -end +end \ No newline at end of file diff --git a/Example/Podfile.lock b/Example/Podfile.lock index f970e0c..e9e88f6 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,23 +1,33 @@ PODS: - - RxCocoa (4.1.2): - - RxSwift (~> 4.0) - - RxSwift (4.1.2) - - STDevRxExt (0.1.2): - - RxCocoa (~> 4.1.2) - - RxSwift (~> 4.1.2) + - RxCocoa (5.0.0): + - RxRelay (~> 5) + - RxSwift (~> 5) + - RxRelay (5.0.0): + - RxSwift (~> 5) + - RxSwift (5.0.0) + - STDevRxExt (0.1.5): + - RxCocoa (~> 5) + - RxSwift (~> 5) DEPENDENCIES: - STDevRxExt (from `../`) +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - RxCocoa + - RxRelay + - RxSwift + EXTERNAL SOURCES: STDevRxExt: - :path: ../ + :path: "../" SPEC CHECKSUMS: - RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a - RxSwift: e49536837d9901277638493ea537394d4b55f570 - STDevRxExt: d8ba812104f9cebe6aee0250536f3cd8d62d040f + RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8 + RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18 + RxSwift: 8b0671caa829a763bbce7271095859121cbd895f + STDevRxExt: 1b62df5fe5ec25219a4bb081fdd57c77094911cb -PODFILE CHECKSUM: 03f0d9ab6a3ddca86ac78ea53d2cfc1bef03c8f8 +PODFILE CHECKSUM: 5d70be023f317fb16b0eaeda1fc62dbab0f9267b -COCOAPODS: 1.3.1 +COCOAPODS: 1.7.0 diff --git a/Example/STDevRxExt.xcodeproj/project.pbxproj b/Example/STDevRxExt.xcodeproj/project.pbxproj index e9345d8..7f248e6 100644 --- a/Example/STDevRxExt.xcodeproj/project.pbxproj +++ b/Example/STDevRxExt.xcodeproj/project.pbxproj @@ -112,7 +112,6 @@ 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, ABFFA786528145F941134D7B /* [CP] Embed Pods Frameworks */, - 92DAC64742707319431404BA /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -130,19 +129,20 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + DevelopmentTeam = Y2RY2C6N5B; + LastSwiftMigration = 1020; TestTargetID = 607FACCF1AFB9204008FA782; }; }; }; buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "STDevRxExt" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -169,21 +169,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 92DAC64742707319431404BA /* [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-STDevRxExt_Tests/Pods-STDevRxExt_Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; A3707137EA0E0FF550D3D5D1 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -208,20 +193,22 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-STDevRxExt_Tests/Pods-STDevRxExt_Tests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-STDevRxExt_Tests/Pods-STDevRxExt_Tests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework", + "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework", "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework", "${BUILT_PRODUCTS_DIR}/STDevRxExt/STDevRxExt.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/STDevRxExt.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-STDevRxExt_Tests/Pods-STDevRxExt_Tests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-STDevRxExt_Tests/Pods-STDevRxExt_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -242,6 +229,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -285,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -297,6 +285,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -333,7 +322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -345,6 +334,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 9EC0293BA12B9FB58FED8B1E /* Pods-STDevRxExt_Tests.debug.xcconfig */; buildSettings = { + DEVELOPMENT_TEAM = Y2RY2C6N5B; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -354,8 +344,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -363,13 +352,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = C44642BE55278B88EDF94A1D /* Pods-STDevRxExt_Tests.release.xcconfig */; buildSettings = { + DEVELOPMENT_TEAM = Y2RY2C6N5B; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Example/STDevRxExt.xcodeproj/xcshareddata/xcschemes/STDevRxExt-Example.xcscheme b/Example/STDevRxExt.xcodeproj/xcshareddata/xcschemes/STDevRxExt-Example.xcscheme index fa288b0..0189fb0 100644 --- a/Example/STDevRxExt.xcodeproj/xcshareddata/xcschemes/STDevRxExt-Example.xcscheme +++ b/Example/STDevRxExt.xcodeproj/xcshareddata/xcschemes/STDevRxExt-Example.xcscheme @@ -1,6 +1,6 @@ 'https://github.com/stdevteam/STDevRxExt.git', :tag => s.version.to_s } # s.social_media_url = 'https://twitter.com/' - s.ios.deployment_target = '9.3' + s.ios.deployment_target = '10.0' s.source_files = 'STDevRxExt/Classes/**/*' - s.dependency 'RxSwift', '~> 4' - s.dependency 'RxCocoa', '~> 4' + s.dependency 'RxSwift', '~> 5' + s.dependency 'RxCocoa', '~> 5' end diff --git a/STDevRxExt/Classes/CastExtensions.swift b/STDevRxExt/Classes/CastExtensions.swift index 444627e..d9e5ad1 100644 --- a/STDevRxExt/Classes/CastExtensions.swift +++ b/STDevRxExt/Classes/CastExtensions.swift @@ -15,11 +15,11 @@ public enum RxCastError: Error { public extension ObservableType { - public func cast(to type: T.Type) -> Observable { + func cast(to type: T.Type) -> Observable { return map { $0 as? T } } - public func forceCast(to type: T.Type) -> Observable { + func forceCast(to type: T.Type) -> Observable { return flatMap { value in Observable.create { observer in if let casted = value as? T { @@ -37,7 +37,7 @@ public extension ObservableType { public extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingStrategy { - public func cast(to type: T.Type) -> Driver { + func cast(to type: T.Type) -> Driver { return map { $0 as? T } } diff --git a/STDevRxExt/Classes/FilterExtensions.swift b/STDevRxExt/Classes/FilterExtensions.swift index ddf21d0..7fc022b 100644 --- a/STDevRxExt/Classes/FilterExtensions.swift +++ b/STDevRxExt/Classes/FilterExtensions.swift @@ -9,36 +9,36 @@ import Foundation import RxSwift import RxCocoa -public extension ObservableType where E == Bool { +public extension ObservableType where Element == Bool { - public func allowTrue() -> Observable { + func allowTrue() -> Observable { return filter { $0 } } - public func allowFalse() -> Observable { + func allowFalse() -> Observable { return filter { !$0 } } } -public extension ObservableType where E == Bool? { +public extension ObservableType where Element == Bool? { - public func allowTrue() -> Observable { + func allowTrue() -> Observable { return map { $0 ?? false } .allowTrue() } - public func allowTrueOrNil() -> Observable { + func allowTrueOrNil() -> Observable { return map { $0 ?? true } .allowTrue() } - public func allowFalse() -> Observable { + func allowFalse() -> Observable { return map { $0 ?? true } .allowFalse() } - public func allowFalseOrNil() -> Observable { + func allowFalseOrNil() -> Observable { return map { $0 ?? false } .allowFalse() } @@ -47,54 +47,54 @@ public extension ObservableType where E == Bool? { public extension ObservableType { - public func filterIfNil(_ param: Optional) -> Observable { + func filterIfNil(_ param: Optional) -> Observable { return filter { _ in param != nil } } - public func filterIfNotNil(_ param: Optional) -> Observable { + func filterIfNotNil(_ param: Optional) -> Observable { return filter { _ in param == nil } } } -public extension ObservableType where E == Optional { +public extension ObservableType where Element == Optional { - public func allowNil() -> Observable { + func allowNil() -> Observable { return filter { $0 == nil } } } -public extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingStrategy, E == Bool { +public extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingStrategy, Element == Bool { - public func allowTrue() -> Driver { + func allowTrue() -> Driver { return filter { $0 } } - public func allowFalse() -> Driver { + func allowFalse() -> Driver { return filter { !$0 } } } -public extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingStrategy, E == Bool? { +public extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingStrategy, Element == Bool? { - public func allowTrue() -> Driver { + func allowTrue() -> Driver { return map { $0 ?? false } .allowTrue() } - public func allowTrueOrNil() -> Driver { + func allowTrueOrNil() -> Driver { return map { $0 ?? true } .allowTrue() } - public func allowFalse() -> Driver { + func allowFalse() -> Driver { return map { $0 ?? true } .allowFalse() } - public func allowFalseOrNil() -> Driver { + func allowFalseOrNil() -> Driver { return map { $0 ?? false } .allowFalse() } @@ -103,11 +103,11 @@ public extension SharedSequenceConvertibleType where SharingStrategy == DriverSh public extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingStrategy { - public func filterIfNil(_ param: Optional) -> Driver { + func filterIfNil(_ param: Optional) -> Driver { return filter { _ in param == nil } } - public func filterIfNotNil(_ param: Optional) -> Driver { + func filterIfNotNil(_ param: Optional) -> Driver { return filter { _ in param != nil } } diff --git a/STDevRxExt/Classes/MapExtensions.swift b/STDevRxExt/Classes/MapExtensions.swift index 82a68c8..59ffa7d 100644 --- a/STDevRxExt/Classes/MapExtensions.swift +++ b/STDevRxExt/Classes/MapExtensions.swift @@ -11,11 +11,11 @@ import RxCocoa public extension ObservableType { - public func map(to value: T) -> Observable { + func map(to value: T) -> Observable { return map { _ in value } } - public func map(at keyPath: KeyPath) -> Observable { + func map(at keyPath: KeyPath) -> Observable { return self.map { $0[keyPath: keyPath] } } @@ -23,11 +23,11 @@ public extension ObservableType { public extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingStrategy { - public func map(to value: T) -> Driver { + func map(to value: T) -> Driver { return map { _ in value } } - public func map(at keyPath: KeyPath) -> Driver { + func map(at keyPath: KeyPath) -> Driver { return map { $0[keyPath: keyPath] } } diff --git a/STDevRxExt/Classes/OtherExtensions.swift b/STDevRxExt/Classes/OtherExtensions.swift index 7baba88..90b0b06 100644 --- a/STDevRxExt/Classes/OtherExtensions.swift +++ b/STDevRxExt/Classes/OtherExtensions.swift @@ -11,7 +11,7 @@ import RxCocoa public extension ObservableType { - public func update(_ observer: T, with value: T.E) -> Observable { + func update(_ observer: T, with value: T.Element) -> Observable { return self.do(onNext: { [observer] _ in observer.onNext(value) }) @@ -21,7 +21,7 @@ public extension ObservableType { public extension SharedSequenceConvertibleType where SharingStrategy == DriverSharingStrategy { - public func update(_ observer: T, with value: T.E) -> SharedSequence { + func update(_ observer: T, with value: T.Element) -> SharedSequence { return self.do(onNext: { [observer] _ in observer.onNext(value) }) From dbeaef293aa25bba6ac3019873ff5e25551b36c4 Mon Sep 17 00:00:00 2001 From: Hovak Davtyan Date: Thu, 23 May 2019 18:19:27 +0400 Subject: [PATCH 2/7] Fix Simulator --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c81c54..eb8db37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ before_install: - gem install cocoapods # Since Travis is not always on latest version - pod install --project-directory=Example --repo-update script: -- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 8,OS=10.0' ONLY_ACTIVE_ARCH=NO | xcpretty -- pod lib lint +- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.0' ONLY_ACTIVE_ARCH=NO | xcpretty +- pod lib lint --allow-warnings notifications: email: recipients: From 473033eec8b5bcf54a7d7c9a24a2154f84b1856e Mon Sep 17 00:00:00 2001 From: Hovak Davtyan Date: Thu, 23 May 2019 18:41:07 +0400 Subject: [PATCH 3/7] Change tests --- Example/Tests/Tests.swift | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Example/Tests/Tests.swift b/Example/Tests/Tests.swift index ec141b6..04c12ac 100644 --- a/Example/Tests/Tests.swift +++ b/Example/Tests/Tests.swift @@ -17,12 +17,5 @@ class Tests: XCTestCase { // This is an example of a functional test case. XCTAssert(true, "Pass") } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measure() { - // Put the code you want to measure the time of here. - } - } - + } From 6938a97f638a3be8fb3b2a413f9ac770ea247d81 Mon Sep 17 00:00:00 2001 From: Hovak Davtyan Date: Thu, 23 May 2019 19:11:54 +0400 Subject: [PATCH 4/7] Set target 11.2 --- .travis.yml | 2 +- Example/Podfile | 2 +- Example/STDevRxExt.xcodeproj/project.pbxproj | 4 ++-- README.md | 2 +- STDevRxExt.podspec | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb8db37..88158ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - gem install cocoapods # Since Travis is not always on latest version - pod install --project-directory=Example --repo-update script: -- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.0' ONLY_ACTIVE_ARCH=NO | xcpretty +- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint --allow-warnings notifications: email: diff --git a/Example/Podfile b/Example/Podfile index 312192c..1a81288 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '10.0' +platform :ios, '11.2' use_frameworks! diff --git a/Example/STDevRxExt.xcodeproj/project.pbxproj b/Example/STDevRxExt.xcodeproj/project.pbxproj index 7f248e6..4463c55 100644 --- a/Example/STDevRxExt.xcodeproj/project.pbxproj +++ b/Example/STDevRxExt.xcodeproj/project.pbxproj @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -322,7 +322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; diff --git a/README.md b/README.md index bfd05f1..3f89a70 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ To run the [Example.playground](Example/Example.playground), clone the repo, and ## Requirements -* iOS 10.0+ +* iOS 11.2+ * Swift 5.0+ * Xcode 10.2+ diff --git a/STDevRxExt.podspec b/STDevRxExt.podspec index e595ad9..dd53daf 100644 --- a/STDevRxExt.podspec +++ b/STDevRxExt.podspec @@ -19,7 +19,7 @@ STDevRxExt contains following 3 type of extensions for RxSwift and RxCocoa: s.source = { :git => 'https://github.com/stdevteam/STDevRxExt.git', :tag => s.version.to_s } # s.social_media_url = 'https://twitter.com/' - s.ios.deployment_target = '10.0' + s.ios.deployment_target = '11.2' s.source_files = 'STDevRxExt/Classes/**/*' From 3f0babe96d1c6e8314af41d105f93867dfceb144 Mon Sep 17 00:00:00 2001 From: Hovak Davtyan Date: Thu, 23 May 2019 19:11:54 +0400 Subject: [PATCH 5/7] Set target 10.0 Set Travis Xcode 10.2.1 (https://stackoverflow.com/questions/55389080/xcode-10-2-failed-to-run-app-on-simulator-with-ios-10) --- .travis.yml | 4 ++-- Example/Podfile | 2 +- Example/Podfile.lock | 2 +- Example/STDevRxExt.xcodeproj/project.pbxproj | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb8db37..8594ab3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # * http://www.objc.io/issue-6/travis-ci.html # * https://github.com/supermarin/xcpretty#usage -osx_image: xcode10.2 +osx_image: xcode10.2.1 language: swift cache: cocoapods podfile: Example/Podfile @@ -10,7 +10,7 @@ before_install: - gem install cocoapods # Since Travis is not always on latest version - pod install --project-directory=Example --repo-update script: -- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.0' ONLY_ACTIVE_ARCH=NO | xcpretty +- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint --allow-warnings notifications: email: diff --git a/Example/Podfile b/Example/Podfile index 312192c..66eb5ca 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -6,4 +6,4 @@ target 'STDevRxExt_Tests' do pod 'STDevRxExt', :path => '../' -end \ No newline at end of file +end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index e9e88f6..47b564b 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -28,6 +28,6 @@ SPEC CHECKSUMS: RxSwift: 8b0671caa829a763bbce7271095859121cbd895f STDevRxExt: 1b62df5fe5ec25219a4bb081fdd57c77094911cb -PODFILE CHECKSUM: 5d70be023f317fb16b0eaeda1fc62dbab0f9267b +PODFILE CHECKSUM: 83769abc0b7bdc83a928dcac34cf2b1154077760 COCOAPODS: 1.7.0 diff --git a/Example/STDevRxExt.xcodeproj/project.pbxproj b/Example/STDevRxExt.xcodeproj/project.pbxproj index 7f248e6..4463c55 100644 --- a/Example/STDevRxExt.xcodeproj/project.pbxproj +++ b/Example/STDevRxExt.xcodeproj/project.pbxproj @@ -273,7 +273,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -322,7 +322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.2; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; From b987e276e5044d2aa89d2fae56eea3499399e484 Mon Sep 17 00:00:00 2001 From: Hovak Davtyan Date: Thu, 23 May 2019 19:11:54 +0400 Subject: [PATCH 6/7] Set Simulator to 12.2 --- .travis.yml | 2 +- Example/Podfile | 2 +- Example/Podfile.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb8db37..6ffbdd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - gem install cocoapods # Since Travis is not always on latest version - pod install --project-directory=Example --repo-update script: -- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.0' ONLY_ACTIVE_ARCH=NO | xcpretty +- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/STDevRxExt.xcworkspace -scheme STDevRxExt-Example -destination 'platform=iOS Simulator,name=iPhone 8,OS=12.2' ONLY_ACTIVE_ARCH=NO | xcpretty - pod lib lint --allow-warnings notifications: email: diff --git a/Example/Podfile b/Example/Podfile index 312192c..66eb5ca 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -6,4 +6,4 @@ target 'STDevRxExt_Tests' do pod 'STDevRxExt', :path => '../' -end \ No newline at end of file +end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index e9e88f6..47b564b 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -28,6 +28,6 @@ SPEC CHECKSUMS: RxSwift: 8b0671caa829a763bbce7271095859121cbd895f STDevRxExt: 1b62df5fe5ec25219a4bb081fdd57c77094911cb -PODFILE CHECKSUM: 5d70be023f317fb16b0eaeda1fc62dbab0f9267b +PODFILE CHECKSUM: 83769abc0b7bdc83a928dcac34cf2b1154077760 COCOAPODS: 1.7.0 From 09a8b301ca2e5cb3728e591c1eac3a5094e56bb1 Mon Sep 17 00:00:00 2001 From: Hovak Davtyan Date: Thu, 23 May 2019 20:08:18 +0400 Subject: [PATCH 7/7] Set Xcode 10.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 52309f2..6ffbdd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ # * http://www.objc.io/issue-6/travis-ci.html # * https://github.com/supermarin/xcpretty#usage -osx_image: xcode10.2.1 +osx_image: xcode10.2 language: swift cache: cocoapods podfile: Example/Podfile