fix: remove rxbus dependency, embed to repository

iamport · Oct 7, 2024 · 12081e7 · 12081e7
1 parent 202f7d2
commit 12081e7
Show file tree

Hide file tree

Showing 23 changed files with 330 additions and 48 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -32,6 +32,6 @@ SPEC CHECKSUMS:
   Swinject: db795b8d6d78559b25fbebb0170d2635be1176e2
   Then: acfe0be7e98221c6204e12f8161459606d5d822d
 
-PODFILE CHECKSUM: 146dde37873645c94b7484ab97e8ffb748326d3f
+PODFILE CHECKSUM: ceeed2078a94b70a44f8d0f16e553607f5311068
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2
diff --git a/Example/iamport-ios.xcodeproj/project.pbxproj b/Example/iamport-ios.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -606,14 +606,15 @@
 			baseConfigurationReference = 08FFCB46A6C09E654DA2AAA6 /* Pods-iamport-ios_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = ZN6U3LJ36Q;
 				INFOPLIST_FILE = "iamport-ios/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.iamport-ios-Example";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.test.demo.iamport-ios-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
@@ -626,14 +627,15 @@
 			baseConfigurationReference = C5D2384CF3E87A54AE0BEA0E /* Pods-iamport-ios_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = ZN6U3LJ36Q;
 				INFOPLIST_FILE = "iamport-ios/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.iamport-ios-Example";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.test.demo.iamport-ios-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;

diff --git a/Example/iamport-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/iamport-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,35 +6,26 @@
         "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
         "state": {
           "branch": null,
-          "revision": "78424be314842833c04bc3bef5b72e85fff99204",
-          "version": "5.6.4"
-        }
-      },
-      {
-        "package": "RxBusForPort",
-        "repositoryURL": "https://github.com/iamport/RxBus-Swift",
-        "state": {
-          "branch": null,
-          "revision": "24458425acf1da825a8e7587231052cef90c3a6b",
-          "version": "1.3.5"
+          "revision": "f455c2975872ccd2d9c81594c658af65716e9b9a",
+          "version": "5.9.1"
         }
       },
       {
         "package": "RxSwift",
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "b4307ba0b6425c0ba4178e138799946c3da594f8",
-          "version": "6.5.0"
+          "revision": "c7c7d2cf50a3211fe2843f76869c698e4e417930",
+          "version": "6.8.0"
         }
       },
       {
         "package": "SwiftFormat",
         "repositoryURL": "https://github.com/nicklockwood/SwiftFormat",
         "state": {
           "branch": null,
-          "revision": "fee7e1a1ac9518cfe3c4673382368641ccbdc62c",
-          "version": "0.51.7"
+          "revision": "ab6844edb79a7b88dc6320e6cee0a0db7674dac3",
+          "version": "0.54.5"
         }
       },
       {

diff --git a/Package.resolved b/Package.resolved
@@ -10,15 +10,6 @@
           "version": "5.4.3"
         }
       },
-      {
-        "package": "RxBus",
-        "repositoryURL": "https://github.com/iamport/RxBus-Swift",
-        "state": {
-          "branch": null,
-          "revision": "b154da5fffb4c5d0d17b7f46e9cd38f382e298e4",
-          "version": "1.3.2"
-        }
-      },
       {
         "package": "RxSwift",
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",

diff --git a/Package.swift b/Package.swift
@@ -19,7 +19,6 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
         .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")),
-        .package(name: "RxBusForPort", url: "https://github.com/iamport/RxBus-Swift", .upToNextMinor(from: "1.3.6-alpha.1")),
         .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.4.0")),
         .package(url: "https://github.com/devxoul/Then.git", .upToNextMajor(from: "2.7.0")),
         .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.50.4")
@@ -29,7 +28,6 @@ let package = Package(
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
             .target(name: "iamport-ios",
                     dependencies: ["RxSwift",
-                                   "RxBusForPort",
                                    "Alamofire",
                                    "Then",
                                    .product(name: "RxCocoa",package: "RxSwift"),

diff --git a/Sources/iamport-ios/Classes/Domain/Utils/EventBus.swift b/Sources/iamport-ios/Classes/Domain/Utils/EventBus.swift
@@ -3,7 +3,6 @@
 //
 
 import Foundation
-import RxBusForPort
 import RxRelay
 import RxSwift