From 309513134090bd5f020fd6f87a15acb2b98f85ae Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 20 Sep 2018 13:17:40 +0300 Subject: [PATCH 1/4] * Swift 4.2 support * updated to newest RxSwift * version bump --- .swift-version | 2 +- Example/Podfile | 8 +-- Example/RxAnimated.xcodeproj/project.pbxproj | 52 +++++-------------- .../xcschemes/RxAnimated-Example.xcscheme | 4 +- RxAnimated.podspec | 8 +-- RxAnimated/Core/RxAnimated+animations.swift | 4 +- RxAnimated/Core/RxAnimated.swift | 10 ++-- 7 files changed, 30 insertions(+), 58 deletions(-) diff --git a/.swift-version b/.swift-version index 5186d07..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2 diff --git a/Example/Podfile b/Example/Podfile index 6a6a357..162dac3 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -2,16 +2,16 @@ use_frameworks! target 'RxAnimated_Example' do - pod 'RxSwift', '~> 4.0.0' - pod 'RxCocoa', '~> 4.0.0' + pod 'RxSwift', '~> 4.3.0' + pod 'RxCocoa', '~> 4.3.0' pod 'RxAnimated', :path => '../' end target 'RxAnimated-Example-AppleTV' do - pod 'RxSwift', '~> 4.0.0' - pod 'RxCocoa', '~> 4.0.0' + pod 'RxSwift', '~> 4.3.0' + pod 'RxCocoa', '~> 4.3.0' pod 'RxAnimated', :path => '../' end diff --git a/Example/RxAnimated.xcodeproj/project.pbxproj b/Example/RxAnimated.xcodeproj/project.pbxproj index 6acfe80..b766d0e 100644 --- a/Example/RxAnimated.xcodeproj/project.pbxproj +++ b/Example/RxAnimated.xcodeproj/project.pbxproj @@ -92,7 +92,9 @@ 18B31256E26057A42427A9D8 /* Pods */, C5DC889F0D573D4FC922070D /* Frameworks */, ); + indentWidth = 4; sourceTree = ""; + tabWidth = 4; }; 607FACD11AFB9204008FA782 /* Products */ = { isa = PBXGroup; @@ -169,7 +171,6 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, D9E68E60EB1FF780DACADE02 /* [CP] Embed Pods Frameworks */, - 1CA317E1D2F6DB261B1AA117 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -189,7 +190,6 @@ 63B65A8F1FB9F59100C630B5 /* Frameworks */, 63B65A901FB9F59100C630B5 /* Resources */, 84B95A7573E55E3A0E6B4E98 /* [CP] Embed Pods Frameworks */, - 0AAB1CB9E5A806F49B657977 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -263,36 +263,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0AAB1CB9E5A806F49B657977 /* [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-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 1CA317E1D2F6DB261B1AA117 /* [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-RxAnimated_Example/Pods-RxAnimated_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 51F34FCC7BA2005E5DBC466C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -317,7 +287,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RxAnimated-tvOS/RxAnimated.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa-tvOS/RxCocoa.framework", "${BUILT_PRODUCTS_DIR}/RxSwift-tvOS/RxSwift.framework", @@ -330,7 +300,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; C12E71681698B18661CFB637 /* [CP] Check Pods Manifest.lock */ = { @@ -357,7 +327,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/RxAnimated-iOS/RxAnimated.framework", "${BUILT_PRODUCTS_DIR}/RxCocoa-iOS/RxCocoa.framework", "${BUILT_PRODUCTS_DIR}/RxSwift-iOS/RxSwift.framework", @@ -370,7 +340,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -474,6 +444,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -519,6 +490,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.2; VALIDATE_PRODUCT = YES; }; name = Release; @@ -535,7 +507,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -551,7 +523,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -575,7 +547,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 11.0; }; @@ -599,7 +571,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.RxAnimated-ExampleAppleTV.RxAnimated-Example-AppleTV"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 11.0; }; diff --git a/Example/RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated-Example.xcscheme b/Example/RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated-Example.xcscheme index 52eee9c..0fe5fdc 100644 --- a/Example/RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated-Example.xcscheme +++ b/Example/RxAnimated.xcodeproj/xcshareddata/xcschemes/RxAnimated-Example.xcscheme @@ -1,6 +1,6 @@ 4.0' - s.dependency 'RxCocoa', '~> 4.0' + s.dependency 'RxSwift', '~> 4.3' + s.dependency 'RxCocoa', '~> 4.3' + + s.swift_version = "4.2" end diff --git a/RxAnimated/Core/RxAnimated+animations.swift b/RxAnimated/Core/RxAnimated+animations.swift index e4c5be7..73de216 100644 --- a/RxAnimated/Core/RxAnimated+animations.swift +++ b/RxAnimated/Core/RxAnimated+animations.swift @@ -5,7 +5,7 @@ import RxCocoa public enum FlipDirection { case left, right, top, bottom - var viewTransition: UIViewAnimationOptions { + var viewTransition: UIView.AnimationOptions { switch self { case .left: return .transitionFlipFromLeft case .right: return .transitionFlipFromRight @@ -42,7 +42,7 @@ extension AnimatedSink where Base: UIView { return AnimatedSink(base: self.base, type: type) } - public func animation(duration: TimeInterval, options: UIViewAnimationOptions = [], animations: @escaping ()->Void) -> AnimatedSink { + public func animation(duration: TimeInterval, options: UIView.AnimationOptions = [], animations: @escaping ()->Void) -> AnimatedSink { let type = AnimationType(type: RxAnimationType.animation, duration: duration, animations: { _ in animations() }) return AnimatedSink(base: self.base, type: type) } diff --git a/RxAnimated/Core/RxAnimated.swift b/RxAnimated/Core/RxAnimated.swift index 632bac2..67a01c1 100644 --- a/RxAnimated/Core/RxAnimated.swift +++ b/RxAnimated/Core/RxAnimated.swift @@ -19,7 +19,7 @@ public struct RxAnimated { */ public enum RxAnimationType { case animation - case transition(UIViewAnimationOptions) + case transition(UIView.AnimationOptions) case spring(damping: CGFloat, velocity: CGFloat) } @@ -29,7 +29,7 @@ public enum RxAnimationType { public struct AnimationType { let type: RxAnimationType let duration: TimeInterval - let options: UIViewAnimationOptions + let options: UIView.AnimationOptions let setup: ((UIView)->Void)? let animations: ((UIView)->Void)? @@ -44,7 +44,7 @@ public struct AnimationType { * - parameter animations: block of code to be executed during animation * - parameter completion: block of code to be executed after the animation has finished */ - public init(type: RxAnimationType, duration: TimeInterval, options: UIViewAnimationOptions = [], setup: ((UIView)->Void)? = nil, animations: ((UIView)->Void)?, completion: ((Bool)->Void)? = nil) { + public init(type: RxAnimationType, duration: TimeInterval, options: UIView.AnimationOptions = [], setup: ((UIView)->Void)? = nil, animations: ((UIView)->Void)?, completion: ((Bool)->Void)? = nil) { self.type = type self.duration = duration self.options = options @@ -93,10 +93,10 @@ public struct AnimationType { return ProcessInfo.processInfo.isLowPowerModeEnabled || ProcessInfo.processInfo.thermalState == .serious || ProcessInfo.processInfo.thermalState == .critical - || UIAccessibilityIsReduceMotionEnabled() + || UIAccessibility.isReduceMotionEnabled } else { return ProcessInfo.processInfo.isLowPowerModeEnabled - || UIAccessibilityIsReduceMotionEnabled() + || UIAccessibility.isReduceMotionEnabled } } } From b73b14c911466221eec98f57cd0c34b6a0144f6b Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 20 Sep 2018 13:19:12 +0300 Subject: [PATCH 2/4] Added Podfile.lock for Example project --- Example/Podfile.lock | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Example/Podfile.lock diff --git a/Example/Podfile.lock b/Example/Podfile.lock new file mode 100644 index 0000000..cd71056 --- /dev/null +++ b/Example/Podfile.lock @@ -0,0 +1,34 @@ +PODS: + - RxAnimated (0.5.0): + - RxAnimated/Core (= 0.5.0) + - RxCocoa (~> 4.3) + - RxSwift (~> 4.3) + - RxAnimated/Core (0.5.0): + - RxCocoa (~> 4.3) + - RxSwift (~> 4.3) + - RxCocoa (4.3.0): + - RxSwift (~> 4.0) + - RxSwift (4.3.0) + +DEPENDENCIES: + - RxAnimated (from `../`) + - RxCocoa (~> 4.3.0) + - RxSwift (~> 4.3.0) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - RxCocoa + - RxSwift + +EXTERNAL SOURCES: + RxAnimated: + :path: "../" + +SPEC CHECKSUMS: + RxAnimated: d934ca1e16efdaf44226e398f229c4419fb0b77b + RxCocoa: 71b9cce833fbcb89a8eec11816dd225830c2bd3c + RxSwift: a9717a34df3179fe63563f76e046ad345078dd3a + +PODFILE CHECKSUM: 3377204d48abfb1d388d997ab22f720b535ac7f0 + +COCOAPODS: 1.6.0.beta.1 From 043bd46de2853c1a7201ef9bf24af679d2f41877 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 20 Sep 2018 13:24:56 +0300 Subject: [PATCH 3/4] * Apple TV example for Swift 4.2 --- Example/Example for RxAnimated AppleTV/AppDelegate.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Example/Example for RxAnimated AppleTV/AppDelegate.swift b/Example/Example for RxAnimated AppleTV/AppDelegate.swift index 44f809e..b03b712 100644 --- a/Example/Example for RxAnimated AppleTV/AppDelegate.swift +++ b/Example/Example for RxAnimated AppleTV/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } From 42622d979aec4292cd03f563b570a63a1b83ca5d Mon Sep 17 00:00:00 2001 From: Marin Todorov Date: Sat, 22 Sep 2018 16:52:08 +0200 Subject: [PATCH 4/4] * removes pod files from example app --- Example/Podfile.lock | 34 ----- Example/RxAnimated.xcodeproj/project.pbxproj | 129 ------------------- 2 files changed, 163 deletions(-) delete mode 100644 Example/Podfile.lock diff --git a/Example/Podfile.lock b/Example/Podfile.lock deleted file mode 100644 index cd71056..0000000 --- a/Example/Podfile.lock +++ /dev/null @@ -1,34 +0,0 @@ -PODS: - - RxAnimated (0.5.0): - - RxAnimated/Core (= 0.5.0) - - RxCocoa (~> 4.3) - - RxSwift (~> 4.3) - - RxAnimated/Core (0.5.0): - - RxCocoa (~> 4.3) - - RxSwift (~> 4.3) - - RxCocoa (4.3.0): - - RxSwift (~> 4.0) - - RxSwift (4.3.0) - -DEPENDENCIES: - - RxAnimated (from `../`) - - RxCocoa (~> 4.3.0) - - RxSwift (~> 4.3.0) - -SPEC REPOS: - https://github.com/cocoapods/specs.git: - - RxCocoa - - RxSwift - -EXTERNAL SOURCES: - RxAnimated: - :path: "../" - -SPEC CHECKSUMS: - RxAnimated: d934ca1e16efdaf44226e398f229c4419fb0b77b - RxCocoa: 71b9cce833fbcb89a8eec11816dd225830c2bd3c - RxSwift: a9717a34df3179fe63563f76e046ad345078dd3a - -PODFILE CHECKSUM: 3377204d48abfb1d388d997ab22f720b535ac7f0 - -COCOAPODS: 1.6.0.beta.1 diff --git a/Example/RxAnimated.xcodeproj/project.pbxproj b/Example/RxAnimated.xcodeproj/project.pbxproj index b766d0e..82999fb 100644 --- a/Example/RxAnimated.xcodeproj/project.pbxproj +++ b/Example/RxAnimated.xcodeproj/project.pbxproj @@ -17,13 +17,10 @@ 63B65A9A1FB9F59200C630B5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63B65A981FB9F59200C630B5 /* Main.storyboard */; }; 63B65A9C1FB9F59200C630B5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 63B65A9B1FB9F59200C630B5 /* Assets.xcassets */; }; 63B65ABD1FB9FB8700C630B5 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; }; - CE9D76DE7D0BB94B46F53B73 /* Pods_RxAnimated_Example_AppleTV.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B141D7192DBBC8577D401A9 /* Pods_RxAnimated_Example_AppleTV.framework */; }; - E51116AA43AB9EBDD7606A44 /* Pods_RxAnimated_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EFCC1B7CEC4E43C5C73CD334 /* Pods_RxAnimated_Example.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 0C7191D437001371A8D26BC2 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - 3945EA0A8C0B584B7B0A3049 /* Pods-RxAnimated_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxAnimated_Tests/Pods-RxAnimated_Tests.debug.xcconfig"; sourceTree = ""; }; 4D1CED6B4F445607D244A2F5 /* RxAnimated.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RxAnimated.podspec; path = ../RxAnimated.podspec; sourceTree = ""; }; 607FACD01AFB9204008FA782 /* RxAnimated_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RxAnimated_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -39,14 +36,6 @@ 63B65A9B1FB9F59200C630B5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 63B65A9D1FB9F59200C630B5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 66ECEEF032088AC8F596BB00 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; - 6DD93B7E2E6682407033BBDE /* Pods-RxAnimated_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example.release.xcconfig"; sourceTree = ""; }; - 788FA5F964C3E2D91874E0B1 /* Pods-RxAnimated-Example-AppleTV.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated-Example-AppleTV.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV.release.xcconfig"; sourceTree = ""; }; - 7FD8F8843BE4B08E34DE32BD /* Pods-RxAnimated-Example-AppleTV.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated-Example-AppleTV.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV.debug.xcconfig"; sourceTree = ""; }; - 8B141D7192DBBC8577D401A9 /* Pods_RxAnimated_Example_AppleTV.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxAnimated_Example_AppleTV.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A6B25E309D9C7F3FF68A59F1 /* Pods_RxAnimated_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxAnimated_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - C9A448793C1BE602847DF10F /* Pods-RxAnimated_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example.debug.xcconfig"; sourceTree = ""; }; - CF263C2F771EBAE633EDC769 /* Pods-RxAnimated_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxAnimated_Tests/Pods-RxAnimated_Tests.release.xcconfig"; sourceTree = ""; }; - EFCC1B7CEC4E43C5C73CD334 /* Pods_RxAnimated_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxAnimated_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,7 +43,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E51116AA43AB9EBDD7606A44 /* Pods_RxAnimated_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -62,26 +50,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CE9D76DE7D0BB94B46F53B73 /* Pods_RxAnimated_Example_AppleTV.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 18B31256E26057A42427A9D8 /* Pods */ = { - isa = PBXGroup; - children = ( - C9A448793C1BE602847DF10F /* Pods-RxAnimated_Example.debug.xcconfig */, - 6DD93B7E2E6682407033BBDE /* Pods-RxAnimated_Example.release.xcconfig */, - 3945EA0A8C0B584B7B0A3049 /* Pods-RxAnimated_Tests.debug.xcconfig */, - CF263C2F771EBAE633EDC769 /* Pods-RxAnimated_Tests.release.xcconfig */, - 7FD8F8843BE4B08E34DE32BD /* Pods-RxAnimated-Example-AppleTV.debug.xcconfig */, - 788FA5F964C3E2D91874E0B1 /* Pods-RxAnimated-Example-AppleTV.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; 607FACC71AFB9204008FA782 = { isa = PBXGroup; children = ( @@ -89,8 +63,6 @@ 607FACD21AFB9204008FA782 /* Example for RxAnimated */, 63B65A931FB9F59100C630B5 /* Example for RxAnimated AppleTV */, 607FACD11AFB9204008FA782 /* Products */, - 18B31256E26057A42427A9D8 /* Pods */, - C5DC889F0D573D4FC922070D /* Frameworks */, ); indentWidth = 4; sourceTree = ""; @@ -149,16 +121,6 @@ path = "Example for RxAnimated AppleTV"; sourceTree = ""; }; - C5DC889F0D573D4FC922070D /* Frameworks */ = { - isa = PBXGroup; - children = ( - EFCC1B7CEC4E43C5C73CD334 /* Pods_RxAnimated_Example.framework */, - A6B25E309D9C7F3FF68A59F1 /* Pods_RxAnimated_Tests.framework */, - 8B141D7192DBBC8577D401A9 /* Pods_RxAnimated_Example_AppleTV.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -166,11 +128,9 @@ isa = PBXNativeTarget; buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "RxAnimated_Example" */; buildPhases = ( - 51F34FCC7BA2005E5DBC466C /* [CP] Check Pods Manifest.lock */, 607FACCC1AFB9204008FA782 /* Sources */, 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, - D9E68E60EB1FF780DACADE02 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -185,11 +145,9 @@ isa = PBXNativeTarget; buildConfigurationList = 63B65ABA1FB9F59200C630B5 /* Build configuration list for PBXNativeTarget "RxAnimated-Example-AppleTV" */; buildPhases = ( - C12E71681698B18661CFB637 /* [CP] Check Pods Manifest.lock */, 63B65A8E1FB9F59100C630B5 /* Sources */, 63B65A8F1FB9F59100C630B5 /* Frameworks */, 63B65A901FB9F59100C630B5 /* Resources */, - 84B95A7573E55E3A0E6B4E98 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -262,89 +220,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 51F34FCC7BA2005E5DBC466C /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RxAnimated_Example-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 84B95A7573E55E3A0E6B4E98 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/RxAnimated-tvOS/RxAnimated.framework", - "${BUILT_PRODUCTS_DIR}/RxCocoa-tvOS/RxCocoa.framework", - "${BUILT_PRODUCTS_DIR}/RxSwift-tvOS/RxSwift.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAnimated.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - C12E71681698B18661CFB637 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-RxAnimated-Example-AppleTV-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - D9E68E60EB1FF780DACADE02 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/RxAnimated-iOS/RxAnimated.framework", - "${BUILT_PRODUCTS_DIR}/RxCocoa-iOS/RxCocoa.framework", - "${BUILT_PRODUCTS_DIR}/RxSwift-iOS/RxSwift.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAnimated.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 607FACCC1AFB9204008FA782 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -497,7 +372,6 @@ }; 607FACF01AFB9204008FA782 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C9A448793C1BE602847DF10F /* Pods-RxAnimated_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = RxAnimated/Info.plist; @@ -513,7 +387,6 @@ }; 607FACF11AFB9204008FA782 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6DD93B7E2E6682407033BBDE /* Pods-RxAnimated_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = RxAnimated/Info.plist; @@ -529,7 +402,6 @@ }; 63B65AB41FB9F59200C630B5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7FD8F8843BE4B08E34DE32BD /* Pods-RxAnimated-Example-AppleTV.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -555,7 +427,6 @@ }; 63B65AB51FB9F59200C630B5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 788FA5F964C3E2D91874E0B1 /* Pods-RxAnimated-Example-AppleTV.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;