From 81c2a2051d85be520a579be556835e6b32ac508c Mon Sep 17 00:00:00 2001 From: Kazuki Horie Date: Sat, 16 Jul 2022 05:13:54 +0900 Subject: [PATCH 1/2] change directory --- Example/Podfile.lock | 28 +++++++++---------- RxController.podspec | 4 +-- .../RxController}/Assets/.gitkeep | 0 .../RxController}/Classes/.gitkeep | 0 .../RxController}/Classes/Log.swift | 0 .../Classes/RxControllerEvent.swift | 0 .../Classes/RxControllerEventBinder.swift | 0 .../Classes/RxControllerEventRouter.swift | 0 .../Classes/RxFlow+Extension.swift | 0 .../Classes/RxViewController.swift | 0 .../RxController}/Classes/RxViewModel.swift | 0 11 files changed, 16 insertions(+), 16 deletions(-) rename {RxController => Sources/RxController}/Assets/.gitkeep (100%) rename {RxController => Sources/RxController}/Classes/.gitkeep (100%) rename {RxController => Sources/RxController}/Classes/Log.swift (100%) rename {RxController => Sources/RxController}/Classes/RxControllerEvent.swift (100%) rename {RxController => Sources/RxController}/Classes/RxControllerEventBinder.swift (100%) rename {RxController => Sources/RxController}/Classes/RxControllerEventRouter.swift (100%) rename {RxController => Sources/RxController}/Classes/RxFlow+Extension.swift (100%) rename {RxController => Sources/RxController}/Classes/RxViewController.swift (100%) rename {RxController => Sources/RxController}/Classes/RxViewModel.swift (100%) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index af2488b..6e3b2fc 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -9,10 +9,10 @@ PODS: - RxBinding (0.5): - RxCocoa (~> 6) - RxSwift (~> 6) - - RxCocoa (6.2.0): - - RxRelay (= 6.2.0) - - RxSwift (= 6.2.0) - - RxController (1.1.0): + - RxCocoa (6.5.0): + - RxRelay (= 6.5.0) + - RxSwift (= 6.5.0) + - RxController (1.2.0): - RxCocoa (~> 6) - RxFlow (~> 2.12.0) - RxSwift (~> 6) @@ -28,10 +28,10 @@ PODS: - RxFlow (2.12.4): - RxCocoa (>= 6.0.0) - RxSwift (>= 6.0.0) - - RxRelay (6.2.0): - - RxSwift (= 6.2.0) - - RxSwift (6.2.0) - - SnapKit (5.0.1) + - RxRelay (6.5.0): + - RxSwift (= 6.5.0) + - RxSwift (6.5.0) + - SnapKit (5.6.0) DEPENDENCIES: - Fakery @@ -63,15 +63,15 @@ SPEC CHECKSUMS: Fakery: a90caff00ca5cacde6c161c3eafc72314a03d34d Reusable: 6bae6a5e8aa793c9c441db0213c863a64bce9136 RxBinding: e3c76d02d0ee3f1a306a0fb8e8ef6f2eda65a375 - RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42 - RxController: e3b8e30891d56ee1e1751f056f0b3654a00e8a28 + RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b + RxController: fd0582e618d05f506ea583143c0ccb35a4e4cc57 RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf RxDataSourcesSingleSection: e646e523ad92109293b22e745b55dcb38bea7a58 RxFlow: 03a73c83fb8f183107074b40ab2544c668583f73 - RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f - RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f - SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb + RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd + RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8 + SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25 PODFILE CHECKSUM: ba6283578e076eb1e1d926dfc1c2610458f4d335 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/RxController.podspec b/RxController.podspec index 6db90aa..10de676 100644 --- a/RxController.podspec +++ b/RxController.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'RxController' - s.version = '1.1.0' + s.version = '1.2.0' s.summary = 'A library for developing with MVVM-C based on RxFlow and RxSwift.' # This description is used to generate tags and improve search results. @@ -30,7 +30,7 @@ These classes make it easy to transfer data among the flows, the parent view mod s.ios.deployment_target = '11.0' s.swift_versions = '5.2' - s.source_files = 'RxController/Classes/**/*' + s.source_files = 'Sources/RxController/Classes/**/*' s.preserve_paths = 'rxtree/**/*' s.dependency 'RxSwift', '~> 6' diff --git a/RxController/Assets/.gitkeep b/Sources/RxController/Assets/.gitkeep similarity index 100% rename from RxController/Assets/.gitkeep rename to Sources/RxController/Assets/.gitkeep diff --git a/RxController/Classes/.gitkeep b/Sources/RxController/Classes/.gitkeep similarity index 100% rename from RxController/Classes/.gitkeep rename to Sources/RxController/Classes/.gitkeep diff --git a/RxController/Classes/Log.swift b/Sources/RxController/Classes/Log.swift similarity index 100% rename from RxController/Classes/Log.swift rename to Sources/RxController/Classes/Log.swift diff --git a/RxController/Classes/RxControllerEvent.swift b/Sources/RxController/Classes/RxControllerEvent.swift similarity index 100% rename from RxController/Classes/RxControllerEvent.swift rename to Sources/RxController/Classes/RxControllerEvent.swift diff --git a/RxController/Classes/RxControllerEventBinder.swift b/Sources/RxController/Classes/RxControllerEventBinder.swift similarity index 100% rename from RxController/Classes/RxControllerEventBinder.swift rename to Sources/RxController/Classes/RxControllerEventBinder.swift diff --git a/RxController/Classes/RxControllerEventRouter.swift b/Sources/RxController/Classes/RxControllerEventRouter.swift similarity index 100% rename from RxController/Classes/RxControllerEventRouter.swift rename to Sources/RxController/Classes/RxControllerEventRouter.swift diff --git a/RxController/Classes/RxFlow+Extension.swift b/Sources/RxController/Classes/RxFlow+Extension.swift similarity index 100% rename from RxController/Classes/RxFlow+Extension.swift rename to Sources/RxController/Classes/RxFlow+Extension.swift diff --git a/RxController/Classes/RxViewController.swift b/Sources/RxController/Classes/RxViewController.swift similarity index 100% rename from RxController/Classes/RxViewController.swift rename to Sources/RxController/Classes/RxViewController.swift diff --git a/RxController/Classes/RxViewModel.swift b/Sources/RxController/Classes/RxViewModel.swift similarity index 100% rename from RxController/Classes/RxViewModel.swift rename to Sources/RxController/Classes/RxViewModel.swift From 9409f0022207f606f590c3c13e8f5df08fe2348d Mon Sep 17 00:00:00 2001 From: Kazuki Horie Date: Sat, 16 Jul 2022 05:24:27 +0900 Subject: [PATCH 2/2] update Package.swift --- .gitignore | 11 ++++++++++- Package.swift | 12 +++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 563ff32..0b8ba54 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,14 @@ Carthage/Build # Swift Package Manager .build +/.previous-build +*~ +\#* +.\#* +.*.sw[nop] +*.xcscmblueprint +/default.profraw +Utilities/Docker/*.tar.gz +.swiftpm Package.resolved -.swiftpm \ No newline at end of file +*.pyc \ No newline at end of file diff --git a/Package.swift b/Package.swift index 948bf45..00ad26b 100644 --- a/Package.swift +++ b/Package.swift @@ -11,11 +11,17 @@ let package = Package( .library(name: "RxController", targets: ["RxController"]) ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")), - .package(url: "https://github.com/RxSwiftCommunity/RxFlow.git", .upToNextMajor(from: "2.5.0")) + .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")), + .package(url: "https://github.com/RxSwiftCommunity/RxFlow.git", .upToNextMajor(from: "2.12.0")) ], targets: [ - .target(name: "RxController", dependencies: ["RxSwift", "RxCocoa", "RxFlow"], path: "RxController") + .target(name: "RxController", + dependencies: [ + "RxSwift", + .product(name: "RxCocoa", package: "RxSwift"), + "RxFlow" + ] + ) ], swiftLanguageVersions: [.v5] )