Merge pull request #26 from yoheimuta/update-depenendency

Update RxSwift 5 to 6
yoheimuta · Apr 18, 2021 · b992280 · b992280
2 parents 6719b0a + fed7fcb
commit b992280
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 62 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveX/RxSwift" "5.0.1"
+github "ReactiveX/RxSwift" "6.1.0"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "ReactiveX/RxSwift" "5.0.1"
+github "ReactiveX/RxSwift" "6.1.0"
diff --git a/Example/ProgressSlider+Rx.swift b/Example/ProgressSlider+Rx.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2019 YOSHIMUTA YOHEI. All rights reserved.
 //
 
-import RxCocoa
 import RxSwift
 import UIKit
 

diff --git a/Example/TableViewController.swift b/Example/TableViewController.swift
@@ -34,10 +34,12 @@ class TableViewController: UITableViewController {
 
         // 1) Create a player
         let items = [
-            "https://storage.googleapis.com/maison-great-dev/oss/musicplayer/tagmp3_1473200_1.mp3",
-            "https://storage.googleapis.com/maison-great-dev/oss/musicplayer/tagmp3_2160166.mp3",
-            "https://storage.googleapis.com/maison-great-dev/oss/musicplayer/tagmp3_4690995.mp3",
-            "https://storage.googleapis.com/maison-great-dev/oss/musicplayer/tagmp3_9179181.mp3",
+            "https://storage.googleapis.com/great-dev/oss/musicplayer/bensound-extremeaction.mp3",
+            "https://storage.googleapis.com/great-dev/oss/musicplayer/bensound-littleplanet.mp3",
+            "https://storage.googleapis.com/great-dev/oss/musicplayer/tagmp3_1473200_1.mp3",
+            "https://storage.googleapis.com/great-dev/oss/musicplayer/tagmp3_2160166.mp3",
+            "https://storage.googleapis.com/great-dev/oss/musicplayer/tagmp3_4690995.mp3",
+            "https://storage.googleapis.com/great-dev/oss/musicplayer/tagmp3_9179181.mp3",
         ]
         .map({ RxMusicPlayerItem(url: URL(string: $0)!) })
         let player = RxMusicPlayer(items: items)!

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ setup:bootstrap install-pod
 
 bootstrap:
 	# carthage bootstrap --platform iOS --cache-builds
-	./carthage.sh bootstrap --platform iOS --cache-builds
+	./carthage.sh bootstrap --platform iOS --use-xcframeworks
 
 update-pod:install-gem
 	bundle exec pod repo update

diff --git a/README.md b/README.md
@@ -303,6 +303,12 @@ class TableViewController: UITableViewController {
 - Push to the branch: git push origin your-new-feature
 - Submit a pull request
 
+### Release
+
+- Create a new release on GitHub
+- Publish a new podspec on Cocoapods
+  - `bundle exec pod trunk push RxMusicPlayer.podspec`
+
 ## Bug Report
 
 While any bug reports are helpful, it's sometimes unable to pinpoint the cause without a reproducible project.

diff --git a/RxMusicPlayer.podspec b/RxMusicPlayer.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "RxMusicPlayer"
-  spec.version      = "0.2.0"
+  spec.version      = "2.0.0"
   spec.summary      = "A reactive library to make it easy for audio playbacks using RxSwift."
 
   # This description is used to generate tags and improve search results.

diff --git a/RxMusicPlayer.xcodeproj/project.pbxproj b/RxMusicPlayer.xcodeproj/project.pbxproj
@@ -3,11 +3,20 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		26BC08410487D678000C1FD8 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9F36DF15A393FC092613E9 /* Pods_Example.framework */; };
+		C23F042D262C40D4004686CE /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2A64DB9262C3EB40018641C /* RxSwift.xcframework */; };
+		C23F042E262C40D4004686CE /* RxSwift.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C2A64DB9262C3EB40018641C /* RxSwift.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		C23F043B262C4183004686CE /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2A64DB9262C3EB40018641C /* RxSwift.xcframework */; };
+		C23F0446262C4228004686CE /* RxCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C23F0445262C4228004686CE /* RxCocoa.xcframework */; };
+		C23F0447262C4228004686CE /* RxCocoa.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C23F0445262C4228004686CE /* RxCocoa.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		C23F0452262C428F004686CE /* RxRelay.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C23F0451262C428F004686CE /* RxRelay.xcframework */; };
+		C23F0453262C428F004686CE /* RxRelay.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C23F0451262C428F004686CE /* RxRelay.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		C23F0457262C4322004686CE /* RxRelay.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C23F0451262C428F004686CE /* RxRelay.xcframework */; };
+		C23F045B262C4326004686CE /* RxCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C23F0445262C4228004686CE /* RxCocoa.xcframework */; };
 		FF11FBC42329E2DE0043C29B /* RxMusicPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF11FBBA2329E2DE0043C29B /* RxMusicPlayer.framework */; };
 		FF11FBC92329E2DE0043C29B /* RxMusicPlayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF11FBC82329E2DE0043C29B /* RxMusicPlayerTests.swift */; };
 		FF11FBCB2329E2DE0043C29B /* RxMusicPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = FF11FBBD2329E2DE0043C29B /* RxMusicPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -20,11 +29,9 @@
 		FF11FBFD2329EE770043C29B /* RxMusicPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF11FBFC2329EE770043C29B /* RxMusicPlayer.swift */; };
 		FF11FBFF2329F3010043C29B /* RxMusicPlayerItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF11FBFE2329F3010043C29B /* RxMusicPlayerItem.swift */; };
 		FF11FC032329F81F0043C29B /* RxMusicPlayerItem+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF11FC022329F81F0043C29B /* RxMusicPlayerItem+Rx.swift */; };
-		FF11FC072329F8660043C29B /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF11FC052329F8660043C29B /* RxSwift.framework */; };
 		FF11FC09232A23FF0043C29B /* AVAsynchronousKeyValueLoading+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF11FC08232A23FF0043C29B /* AVAsynchronousKeyValueLoading+Rx.swift */; };
 		FF11FC0B232A270D0043C29B /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF11FC0A232A270D0043C29B /* MediaPlayer.framework */; };
 		FF11FC11232A2A5E0043C29B /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF11FC10232A2A5E0043C29B /* TableViewController.swift */; };
-		FF11FC14232A315B0043C29B /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF11FC052329F8660043C29B /* RxSwift.framework */; };
 		FF11FC16232A391F0043C29B /* RxMusicPlayerError.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF11FC15232A391F0043C29B /* RxMusicPlayerError.swift */; };
 		FF1EBBBC2331C9210049C1C6 /* Double+Int.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF1EBBBB2331C9210049C1C6 /* Double+Int.swift */; };
 		FF1EBBBE2331DECD0049C1C6 /* AVPlayer+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF1EBBBD2331DECD0049C1C6 /* AVPlayer+Rx.swift */; };
@@ -73,6 +80,9 @@
 			dstSubfolderSpec = 10;
 			files = (
 				FFC91B25232B92E200B3E89A /* RxMusicPlayer.framework in Embed Frameworks */,
+				C23F0453262C428F004686CE /* RxRelay.xcframework in Embed Frameworks */,
+				C23F042E262C40D4004686CE /* RxSwift.xcframework in Embed Frameworks */,
+				C23F0447262C4228004686CE /* RxCocoa.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -83,6 +93,9 @@
 		29F14102611888BD7A78FEDB /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
 		4B9F36DF15A393FC092613E9 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A2967B6D05CEF133682298D0 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
+		C23F0445262C4228004686CE /* RxCocoa.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxCocoa.xcframework; path = Carthage/Build/RxCocoa.xcframework; sourceTree = "<group>"; };
+		C23F0451262C428F004686CE /* RxRelay.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxRelay.xcframework; path = Carthage/Build/RxRelay.xcframework; sourceTree = "<group>"; };
+		C2A64DB9262C3EB40018641C /* RxSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxSwift.xcframework; path = Carthage/Build/RxSwift.xcframework; sourceTree = "<group>"; };
 		FF11FBBA2329E2DE0043C29B /* RxMusicPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxMusicPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		FF11FBBD2329E2DE0043C29B /* RxMusicPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxMusicPlayer.h; sourceTree = "<group>"; };
 		FF11FBBE2329E2DE0043C29B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -125,7 +138,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FF11FC072329F8660043C29B /* RxSwift.framework in Frameworks */,
+				C23F045B262C4326004686CE /* RxCocoa.xcframework in Frameworks */,
+				C23F0457262C4322004686CE /* RxRelay.xcframework in Frameworks */,
+				C23F043B262C4183004686CE /* RxSwift.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -141,8 +156,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FF11FC14232A315B0043C29B /* RxSwift.framework in Frameworks */,
 				FF11FC0B232A270D0043C29B /* MediaPlayer.framework in Frameworks */,
+				C23F042D262C40D4004686CE /* RxSwift.xcframework in Frameworks */,
+				C23F0446262C4228004686CE /* RxCocoa.xcframework in Frameworks */,
+				C23F0452262C428F004686CE /* RxRelay.xcframework in Frameworks */,
 				FF11FBF92329E50E0043C29B /* RxMusicPlayer.framework in Frameworks */,
 				26BC08410487D678000C1FD8 /* Pods_Example.framework in Frameworks */,
 			);
@@ -251,6 +268,9 @@
 		FF11FBF82329E50E0043C29B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				C23F0451262C428F004686CE /* RxRelay.xcframework */,
+				C23F0445262C4228004686CE /* RxCocoa.xcframework */,
+				C2A64DB9262C3EB40018641C /* RxSwift.xcframework */,
 				FF11FC0A232A270D0043C29B /* MediaPlayer.framework */,
 				FF11FC052329F8660043C29B /* RxSwift.framework */,
 				4B9F36DF15A393FC092613E9 /* Pods_Example.framework */,
@@ -281,7 +301,6 @@
 				FF11FBB72329E2DE0043C29B /* Frameworks */,
 				FF11FBB82329E2DE0043C29B /* Resources */,
 				FF11FBFB2329E8070043C29B /* Lint */,
-				FF11FC12232A2C5E0043C29B /* Copy Frameworks(Carthage) */,
 			);
 			buildRules = (
 			);
@@ -319,7 +338,6 @@
 				FF11FBD52329E3560043C29B /* Frameworks */,
 				FF11FBD62329E3560043C29B /* Resources */,
 				FF11FBFA2329E7D00043C29B /* Lint */,
-				FF11FC13232A312D0043C29B /* Copy Frameworks(Carthage) */,
 				FFC91B28232B92E300B3E89A /* Embed Frameworks */,
 			);
 			buildRules = (
@@ -495,46 +513,6 @@
 			shellPath = /bin/sh;
 			shellScript = "set -exo pipefail\n\nPODS_ROOT=./Pods\n\nif [ -z \"$CI\" ]; then\n${PODS_ROOT}/SwiftLint/swiftlint autocorrect\n${PODS_ROOT}/SwiftLint/swiftlint\n\n${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat RxMusicPlayer\nelse\n${PODS_ROOT}/SwiftLint/swiftlint --strict\n${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat RxMusicPlayer --dryrun | tee /dev/stderr | grep 'swiftformat completed. 0'\nfi\n";
 		};
-		FF11FC12232A2C5E0043C29B /* Copy Frameworks(Carthage) */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"$(SRCROOT)/input.xcfilelist",
-			);
-			inputPaths = (
-			);
-			name = "Copy Frameworks(Carthage)";
-			outputFileListPaths = (
-				"$(SRCROOT)/output.xcfilelist",
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks\n";
-		};
-		FF11FC13232A312D0043C29B /* Copy Frameworks(Carthage) */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"$(SRCROOT)/input.xcfilelist",
-			);
-			inputPaths = (
-			);
-			name = "Copy Frameworks(Carthage)";
-			outputFileListPaths = (
-				"$(SRCROOT)/output.xcfilelist",
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks\n";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/RxMusicPlayer/AVAsynchronousKeyValueLoading+Rx.swift b/RxMusicPlayer/AVAsynchronousKeyValueLoading+Rx.swift
@@ -20,7 +20,7 @@ extension Reactive where Base: AVAsynchronousKeyValueLoading {
                 case .loaded:
                     observer(.success(()))
                 default:
-                    observer(.error(error ?? NSError()))
+                    observer(.failure(error ?? NSError()))
                 }
             }
             return Disposables.create()

diff --git a/RxMusicPlayer/RxMusicPlayer.swift b/RxMusicPlayer/RxMusicPlayer.swift
@@ -386,7 +386,7 @@ open class RxMusicPlayer: NSObject {
 
     private func runCommand(cmd: Command) -> Observable<()> {
         return rx.canSendCommand(cmd: cmd).asObservable().take(1)
-            .observeOn(scheduler)
+            .observe(on: scheduler)
             .flatMapLatest { [weak self] isEnabled -> Observable<()> in
                 guard let weakSelf = self else {
                     return .error(RxMusicPlayerError.notFoundWeakReference)
@@ -413,7 +413,7 @@ open class RxMusicPlayer: NSObject {
                     return weakSelf.prefetch()
                 }
             }
-            .catchError { [weak self] err in
+            .catch { [weak self] err in
                 self?.status = .failed(err: err)
                 return .just(())
             }
@@ -526,7 +526,7 @@ open class RxMusicPlayer: NSObject {
             items.map { $0.loadPlayerItem().asObservable() }
         )
         .map { _ in }
-        .catchErrorJustReturn(())
+        .catchAndReturn(())
     }
 
     private func watchPlayerStatus(player: AVPlayer?) -> Observable<()> {

diff --git a/RxMusicPlayer/RxMusicPlayerItem.swift b/RxMusicPlayer/RxMusicPlayerItem.swift
@@ -138,7 +138,7 @@ open class RxMusicPlayerItem: NSObject {
                 single(.success(self))
             }
             .subscribe(onError: { err in
-                single(.error(RxMusicPlayerError.playerItemMetadataFailed(err: err)))
+                single(.failure(RxMusicPlayerError.playerItemMetadataFailed(err: err)))
             })
 
             return Disposables.create {

diff --git a/bitrise.yml b/bitrise.yml
@@ -25,7 +25,7 @@ workflows:
             set -x
 
             # write your script here
-            ./carthage.sh bootstrap --platform iOS --cache-builds
+            ./carthage.sh bootstrap --platform iOS --use-xcframeworks
     - [email protected]:
         inputs:
         - project_path: "$BITRISE_PROJECT_PATH"