Skip to content

Commit 4ae5b55

Browse files
marshallxxxmarshallxxx
committed
Update Podfile
Remove unnecessary RxCocoa
1 parent 07aba23 commit 4ae5b55

7 files changed

Lines changed: 55 additions & 21 deletions

File tree

‎Example/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ source 'https://github.com/CocoaPods/Specs.git'
33
use_frameworks!
44

55
target 'RxCoreData_Example' do
6-
pod 'RxSwift', '~> 4.0'
7-
pod 'RxCocoa', '~> 4.0'
6+
pod 'RxSwift', '~> 4.2'
7+
pod 'RxCocoa', '~> 4.2'
88
pod 'RxDataSources', '~> 3.0'
99
pod 'RxCoreData', :path => '../'
1010
end

‎Example/Podfile.lock‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
PODS:
22
- Differentiator (3.0.1)
3-
- RxCocoa (4.0.0):
4-
- RxSwift (~> 4.0)
5-
- RxCoreData (0.4.0):
6-
- RxCocoa (~> 4.0)
3+
- RxCocoa (4.2.0):
74
- RxSwift (~> 4.0)
5+
- RxCoreData (0.5.0):
6+
- RxSwift (~> 4.2.0)
87
- RxDataSources (3.0.1):
98
- Differentiator (~> 3.0)
109
- RxCocoa (~> 4.0)
1110
- RxSwift (~> 4.0)
12-
- RxSwift (4.0.0)
11+
- RxSwift (4.2.0)
1312

1413
DEPENDENCIES:
15-
- RxCocoa (~> 4.0)
14+
- RxCocoa (~> 4.2)
1615
- RxCoreData (from `../`)
1716
- RxDataSources (~> 3.0)
18-
- RxSwift (~> 4.0)
17+
- RxSwift (~> 4.2)
1918

2019
EXTERNAL SOURCES:
2120
RxCoreData:
2221
:path: ../
2322

2423
SPEC CHECKSUMS:
2524
Differentiator: ffe513ce1ea4e7198b89fac94d6e281c673055a9
26-
RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e
27-
RxCoreData: 273c263c44755cd05bd6aa581afe956e60021007
25+
RxCocoa: 0b54909c902e1e581212a03e690bbd94032d8baa
26+
RxCoreData: 366c6d5857d265d80df891b280d91457b12c8224
2827
RxDataSources: 098b7e62b6316313b14d6bf594e3f4f4f62a238a
29-
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
28+
RxSwift: 99e10317ddfcc7fbe01356aafd118fde4a0be104
3029

31-
PODFILE CHECKSUM: b9b4bf3a41cc2a570f2b65429144a7bc8eae50cc
30+
PODFILE CHECKSUM: 2301a0f899260fdadebbe33712ceb07d8d35af52
3231

33-
COCOAPODS: 1.3.1
32+
COCOAPODS: 1.4.0

‎Example/RxCoreData.xcodeproj/project.pbxproj‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
77EECB9E50343E5362FDE498 /* [CP] Embed Pods Frameworks */,
184184
2E6B561F32E09B2E7FC48B85 /* 📦 Embed Pods Frameworks */,
185185
3A8ED13CDBE777B8BAAC4601 /* 📦 Copy Pods Resources */,
186+
81B1497C1DE64D3DEB2F0161 /* [CP] Copy Pods Resources */,
186187
);
187188
buildRules = (
188189
);
@@ -205,6 +206,7 @@
205206
BE3F737842926DCBAEF33B1C /* [CP] Embed Pods Frameworks */,
206207
25D10640889A11CBC96C9A36 /* 📦 Embed Pods Frameworks */,
207208
2124F1C4EBA2827C0B8EF670 /* 📦 Copy Pods Resources */,
209+
CD0F33E6F629F0617CA25311 /* [CP] Copy Pods Resources */,
208210
);
209211
buildRules = (
210212
);
@@ -396,6 +398,21 @@
396398
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxCoreData_Example/Pods-RxCoreData_Example-frameworks.sh\"\n";
397399
showEnvVarsInLog = 0;
398400
};
401+
81B1497C1DE64D3DEB2F0161 /* [CP] Copy Pods Resources */ = {
402+
isa = PBXShellScriptBuildPhase;
403+
buildActionMask = 2147483647;
404+
files = (
405+
);
406+
inputPaths = (
407+
);
408+
name = "[CP] Copy Pods Resources";
409+
outputPaths = (
410+
);
411+
runOnlyForDeploymentPostprocessing = 0;
412+
shellPath = /bin/sh;
413+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxCoreData_Example/Pods-RxCoreData_Example-resources.sh\"\n";
414+
showEnvVarsInLog = 0;
415+
};
399416
8B149104208C41903E8E6A77 /* [CP] Check Pods Manifest.lock */ = {
400417
isa = PBXShellScriptBuildPhase;
401418
buildActionMask = 2147483647;
@@ -421,13 +438,11 @@
421438
);
422439
inputPaths = (
423440
"${SRCROOT}/Pods/Target Support Files/Pods-RxCoreData_Tests/Pods-RxCoreData_Tests-frameworks.sh",
424-
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
425441
"${BUILT_PRODUCTS_DIR}/RxCoreData/RxCoreData.framework",
426442
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
427443
);
428444
name = "[CP] Embed Pods Frameworks";
429445
outputPaths = (
430-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
431446
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCoreData.framework",
432447
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
433448
);
@@ -436,6 +451,21 @@
436451
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxCoreData_Tests/Pods-RxCoreData_Tests-frameworks.sh\"\n";
437452
showEnvVarsInLog = 0;
438453
};
454+
CD0F33E6F629F0617CA25311 /* [CP] Copy Pods Resources */ = {
455+
isa = PBXShellScriptBuildPhase;
456+
buildActionMask = 2147483647;
457+
files = (
458+
);
459+
inputPaths = (
460+
);
461+
name = "[CP] Copy Pods Resources";
462+
outputPaths = (
463+
);
464+
runOnlyForDeploymentPostprocessing = 0;
465+
shellPath = /bin/sh;
466+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxCoreData_Tests/Pods-RxCoreData_Tests-resources.sh\"\n";
467+
showEnvVarsInLog = 0;
468+
};
439469
CF5EA17E47B30114DF76F5C2 /* [CP] Check Pods Manifest.lock */ = {
440470
isa = PBXShellScriptBuildPhase;
441471
buildActionMask = 2147483647;
@@ -613,7 +643,7 @@
613643
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
614644
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
615645
MODULE_NAME = ExampleApp;
616-
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
646+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.RxCoreData-Example";
617647
PRODUCT_NAME = "$(TARGET_NAME)";
618648
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
619649
SWIFT_VERSION = 4.0;
@@ -633,7 +663,7 @@
633663
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
634664
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
635665
MODULE_NAME = ExampleApp;
636-
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
666+
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.RxCoreData-Example";
637667
PRODUCT_NAME = "$(TARGET_NAME)";
638668
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
639669
SWIFT_VERSION = 4.0;

‎Example/RxCoreData.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎RxCoreData.podspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ Pod::Spec.new do |s|
3131
s.frameworks = 'CoreData'
3232

3333
s.dependency 'RxSwift', '~> 4.2.0'
34-
s.dependency 'RxCocoa', '~> 4.2.0'
3534
end

‎Sources/FetchedResultsControllerControllerEntityObserver.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import Foundation
1010
import CoreData
1111
import RxSwift
12-
import RxCocoa
1312

1413
public final class FetchedResultsControllerEntityObserver<T: NSManagedObject> : NSObject, NSFetchedResultsControllerDelegate {
1514

‎Sources/NSManagedObjectContext+Rx.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import Foundation
1010
import CoreData
1111
import RxSwift
12-
import RxCocoa
1312

1413
public extension Reactive where Base: NSManagedObjectContext {
1514

0 commit comments

Comments
 (0)