Merge pull request #39 from fassko/master

Version 0.7.0
RxSwiftCommunity · Mar 6, 2020 · ae67789 · ae67789
2 parents 5bf45be + fdb17ed
commit ae67789
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 29 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -2,16 +2,16 @@ use_frameworks!
 
 target 'RxAnimated_Example' do
 
-  pod 'RxSwift', '~> 5.0.0'
-  pod 'RxCocoa', '~> 5.0.0'
+  pod 'RxSwift', '~> 5.1.0'
+  pod 'RxCocoa', '~> 5.1.0'
   pod 'RxAnimated', :path => '../'
 
 end
 
 target 'RxAnimated-Example-AppleTV' do
 
-  pod 'RxSwift', '~> 5.0.0'
-  pod 'RxCocoa', '~> 5.0.0'
+  pod 'RxSwift', '~> 5.1.0'
+  pod 'RxCocoa', '~> 5.1.0'
   pod 'RxAnimated', :path => '../'
 
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,25 +1,25 @@
 PODS:
-  - RxAnimated (0.6.0):
-    - RxAnimated/Core (= 0.6.0)
-    - RxCocoa (~> 5.0)
-    - RxSwift (~> 5.0)
-  - RxAnimated/Core (0.6.0):
-    - RxCocoa (~> 5.0)
-    - RxSwift (~> 5.0)
-  - RxCocoa (5.0.0):
+  - RxAnimated (0.7.0):
+    - RxAnimated/Core (= 0.7.0)
+    - RxCocoa (~> 5.1)
+    - RxSwift (~> 5.1)
+  - RxAnimated/Core (0.7.0):
+    - RxCocoa (~> 5.1)
+    - RxSwift (~> 5.1)
+  - RxCocoa (5.1.0):
     - RxRelay (~> 5)
     - RxSwift (~> 5)
-  - RxRelay (5.0.0):
+  - RxRelay (5.1.0):
     - RxSwift (~> 5)
-  - RxSwift (5.0.0)
+  - RxSwift (5.1.0)
 
 DEPENDENCIES:
   - RxAnimated (from `../`)
-  - RxCocoa (~> 5.0.0)
-  - RxSwift (~> 5.0.0)
+  - RxCocoa (~> 5.1.0)
+  - RxSwift (~> 5.1.0)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - RxCocoa
     - RxRelay
     - RxSwift
@@ -29,11 +29,11 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  RxAnimated: 990036fbb8db293de9fb1fc56f3808d5f9ff57a6
-  RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
-  RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
-  RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
+  RxAnimated: 8540892468e906e7404595bc51ed4b36b3737ab5
+  RxCocoa: 13d2a4d7546a34b8ececae8c281e4ea1dbb94f2b
+  RxRelay: a168bd6caf712d00c676ac344e9295afc93b418e
+  RxSwift: ad5874f24bb0dbffd1e9bb8443604e3578796c7a
 
-PODFILE CHECKSUM: 8dd3d5fe3ba97bba28d15faa72549aeced7cad81
+PODFILE CHECKSUM: 0fde4b5914dec89a7a84760211a9ae5223a647e6
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.9.0
diff --git a/Example/RxAnimated.xcodeproj/project.pbxproj b/Example/RxAnimated.xcodeproj/project.pbxproj
@@ -17,11 +17,16 @@
 		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 */; };
+		9667B5B320A03EFA5F9E9A09 /* Pods_RxAnimated_Example_AppleTV.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 915D78FCE8F106F68FFB096A /* Pods_RxAnimated_Example_AppleTV.framework */; };
+		D2EA27DECD69CAB631B0888A /* Pods_RxAnimated_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CA3383E42875F78073EA655 /* 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 = "<group>"; };
+		1CEAC8954D3F9CFA7CB1AFEE /* Pods-RxAnimated_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated_Example.debug.xcconfig"; path = "Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		4D1CED6B4F445607D244A2F5 /* RxAnimated.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RxAnimated.podspec; path = ../RxAnimated.podspec; sourceTree = "<group>"; };
+		507B3E6E7E967AD85C09A841 /* Pods-RxAnimated-Example-AppleTV.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated-Example-AppleTV.release.xcconfig"; path = "Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV.release.xcconfig"; sourceTree = "<group>"; };
+		5324A5266CDC3A4B62660258 /* Pods-RxAnimated_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated_Example.release.xcconfig"; path = "Target Support Files/Pods-RxAnimated_Example/Pods-RxAnimated_Example.release.xcconfig"; sourceTree = "<group>"; };
 		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 = "<group>"; };
 		607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -36,20 +41,25 @@
 		63B65A9B1FB9F59200C630B5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		63B65A9D1FB9F59200C630B5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		66ECEEF032088AC8F596BB00 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
+		7CA3383E42875F78073EA655 /* Pods_RxAnimated_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxAnimated_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		915D78FCE8F106F68FFB096A /* Pods_RxAnimated_Example_AppleTV.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxAnimated_Example_AppleTV.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		BB8F7A8103FDDE3665D75A3A /* Pods-RxAnimated-Example-AppleTV.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxAnimated-Example-AppleTV.debug.xcconfig"; path = "Target Support Files/Pods-RxAnimated-Example-AppleTV/Pods-RxAnimated-Example-AppleTV.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		607FACCD1AFB9204008FA782 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D2EA27DECD69CAB631B0888A /* Pods_RxAnimated_Example.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		63B65A8F1FB9F59100C630B5 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9667B5B320A03EFA5F9E9A09 /* Pods_RxAnimated_Example_AppleTV.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -64,6 +74,7 @@
 				63B65A931FB9F59100C630B5 /* Example for RxAnimated AppleTV */,
 				607FACD11AFB9204008FA782 /* Products */,
 				D918CCBAEDD098DFD4DCDDBB /* Pods */,
+				90097494BE82623458246CE5 /* Frameworks */,
 			);
 			indentWidth = 4;
 			sourceTree = "<group>";
@@ -122,9 +133,22 @@
 			path = "Example for RxAnimated AppleTV";
 			sourceTree = "<group>";
 		};
+		90097494BE82623458246CE5 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				915D78FCE8F106F68FFB096A /* Pods_RxAnimated_Example_AppleTV.framework */,
+				7CA3383E42875F78073EA655 /* Pods_RxAnimated_Example.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		D918CCBAEDD098DFD4DCDDBB /* Pods */ = {
 			isa = PBXGroup;
 			children = (
+				BB8F7A8103FDDE3665D75A3A /* Pods-RxAnimated-Example-AppleTV.debug.xcconfig */,
+				507B3E6E7E967AD85C09A841 /* Pods-RxAnimated-Example-AppleTV.release.xcconfig */,
+				1CEAC8954D3F9CFA7CB1AFEE /* Pods-RxAnimated_Example.debug.xcconfig */,
+				5324A5266CDC3A4B62660258 /* Pods-RxAnimated_Example.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -136,9 +160,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "RxAnimated_Example" */;
 			buildPhases = (
+				33B8499F33E1F13243ECADBD /* [CP] Check Pods Manifest.lock */,
 				607FACCC1AFB9204008FA782 /* Sources */,
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
+				FCC2C922B461EBEE773F87EE /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -153,9 +179,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 63B65ABA1FB9F59200C630B5 /* Build configuration list for PBXNativeTarget "RxAnimated-Example-AppleTV" */;
 			buildPhases = (
+				F67AA144F90965F6D9D7B415 /* [CP] Check Pods Manifest.lock */,
 				63B65A8E1FB9F59100C630B5 /* Sources */,
 				63B65A8F1FB9F59100C630B5 /* Frameworks */,
 				63B65A901FB9F59100C630B5 /* Resources */,
+				9C52BA308EF678BB6CCF7EDD /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -228,6 +256,101 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		33B8499F33E1F13243ECADBD /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			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;
+		};
+		9C52BA308EF678BB6CCF7EDD /* [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}/RxRelay-tvOS/RxRelay.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}/RxRelay.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;
+		};
+		F67AA144F90965F6D9D7B415 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			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;
+		};
+		FCC2C922B461EBEE773F87EE /* [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}/RxRelay-iOS/RxRelay.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}/RxRelay.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;
@@ -386,6 +509,7 @@
 		};
 		607FACF01AFB9204008FA782 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1CEAC8954D3F9CFA7CB1AFEE /* Pods-RxAnimated_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = RxAnimated/Info.plist;
@@ -401,6 +525,7 @@
 		};
 		607FACF11AFB9204008FA782 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 5324A5266CDC3A4B62660258 /* Pods-RxAnimated_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = RxAnimated/Info.plist;
@@ -416,6 +541,7 @@
 		};
 		63B65AB41FB9F59200C630B5 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = BB8F7A8103FDDE3665D75A3A /* Pods-RxAnimated-Example-AppleTV.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -441,6 +567,7 @@
 		};
 		63B65AB51FB9F59200C630B5 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 507B3E6E7E967AD85C09A841 /* Pods-RxAnimated-Example-AppleTV.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;

diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
-          "version": "5.0.1"
+          "revision": "c1bd31b397d87a54467af4161dde9d6b27720c19",
+          "version": "5.1.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
         .library(name: "RxCocoaRuntime", targets: ["RxAnimated"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
+        .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.0")),
     ],
     targets: [
         .target(

diff --git a/RxAnimated.podspec b/RxAnimated.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'RxAnimated'
-  s.version          = '0.6.1'
+  s.version          = '0.7.0'
   s.summary          = 'Animated bindings for RxSwift/RxCocoa'
 
   s.description      = <<-DESC
@@ -27,8 +27,8 @@ Pod::Spec.new do |s|
 #  end
 
   s.frameworks = 'UIKit'
-  s.dependency 'RxSwift', '~> 5.0'
-  s.dependency 'RxCocoa', '~> 5.0'
+  s.dependency 'RxSwift', '~> 5.1'
+  s.dependency 'RxCocoa', '~> 5.1'
 
   s.swift_version = "5.0"