Skip to content

Commit d8c777b

Browse files
Bob Godwin Obibobgodwinx
Bob Godwin Obi
authored and
bobgodwinx
committed
deintegrated CocoaPods from the project because it conflicts with a test target and added Cartfile.private
 Author: bobgodwinx <[email protected]>
1 parent 376afc2 commit d8c777b

File tree

6 files changed

+2
-148
lines changed

6 files changed

+2
-148
lines changed

‎Cartfile.private

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "Quick/Quick"
2+
github "Quick/Nimble"

‎Podfile

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎Podfile.lock

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎RxWebKit.xcodeproj/project.pbxproj

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2D9D193AAB6629FC0C06059F /* Pods_RxWebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46FB3C90F3D7D4416B825C36 /* Pods_RxWebKit.framework */; };
1110
424205821C89E99500214DA1 /* Rx+WebKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42F426DB1C662CF9001FED46 /* Rx+WebKit.swift */; };
1211
424205851C89E9DF00214DA1 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424205831C89E9DF00214DA1 /* RxSwift.framework */; };
1312
424205861C89E9DF00214DA1 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424205841C89E9DF00214DA1 /* RxCocoa.framework */; };
@@ -20,7 +19,6 @@
2019
42F426D51C6623C5001FED46 /* RxWebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42F426CE1C6623C5001FED46 /* RxWebKit.framework */; };
2120
42F426D61C6623C5001FED46 /* RxWebKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 42F426CE1C6623C5001FED46 /* RxWebKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2221
42F426DC1C662CF9001FED46 /* Rx+WebKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42F426DB1C662CF9001FED46 /* Rx+WebKit.swift */; };
23-
6B616B2F285CDDC880DAB26F /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E3C34C58279FC5E2A35DD9F1 /* Pods_Example.framework */; };
2422
C4607FD01FA0DAC9002DA12F /* RxWKUIDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4607FCF1FA0DAC9002DA12F /* RxWKUIDelegateProxy.swift */; };
2523
C4607FD11FA0DAC9002DA12F /* RxWKUIDelegateProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4607FCF1FA0DAC9002DA12F /* RxWKUIDelegateProxy.swift */; };
2624
C4607FD61FA0DC40002DA12F /* RxWKUIDelegateEvents+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4607FD51FA0DC40002DA12F /* RxWKUIDelegateEvents+Rx.swift */; };
@@ -65,7 +63,6 @@
6563
/* End PBXCopyFilesBuildPhase section */
6664

6765
/* Begin PBXFileReference section */
68-
08C4DA7227F508A46FCA1DD6 /* Pods-RxWebKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxWebKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxWebKit/Pods-RxWebKit.debug.xcconfig"; sourceTree = "<group>"; };
6966
4242057A1C89E95100214DA1 /* RxWebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxWebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7067
424205831C89E9DF00214DA1 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
7168
424205841C89E9DF00214DA1 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = "<group>"; };
@@ -80,10 +77,6 @@
8077
42F426D01C6623C5001FED46 /* RxWebKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RxWebKit.h; sourceTree = "<group>"; };
8178
42F426D21C6623C5001FED46 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8279
42F426DB1C662CF9001FED46 /* Rx+WebKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Rx+WebKit.swift"; sourceTree = "<group>"; };
83-
46FB3C90F3D7D4416B825C36 /* Pods_RxWebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxWebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
84-
494317696D9F726E88C1D1C9 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
85-
A06BE07DD958EBAC83F7BA53 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
86-
AA7B81072D217E470FE2C4C9 /* Pods-RxWebKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxWebKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxWebKit/Pods-RxWebKit.release.xcconfig"; sourceTree = "<group>"; };
8780
C4607FCF1FA0DAC9002DA12F /* RxWKUIDelegateProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxWKUIDelegateProxy.swift; sourceTree = "<group>"; };
8881
C4607FD51FA0DC40002DA12F /* RxWKUIDelegateEvents+Rx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RxWKUIDelegateEvents+Rx.swift"; sourceTree = "<group>"; };
8982
C4607FDA1FA0E68F002DA12F /* JavaScriptAlertPanelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JavaScriptAlertPanelViewController.swift; sourceTree = "<group>"; };
@@ -94,7 +87,6 @@
9487
C4878CD91FA11B5A00B12C60 /* OtherRequestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OtherRequestViewController.swift; sourceTree = "<group>"; };
9588
C48E617D1F9E27A700C6A753 /* RxWKNavigationDelegateProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxWKNavigationDelegateProxy.swift; sourceTree = "<group>"; };
9689
C48E61831F9E336000C6A753 /* WKNavigationDelegateEvents+Rx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WKNavigationDelegateEvents+Rx.swift"; sourceTree = "<group>"; };
97-
E3C34C58279FC5E2A35DD9F1 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9890
F68CEB9D22521B1D00498607 /* InvokeJSFunctionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvokeJSFunctionViewController.swift; sourceTree = "<group>"; };
9991
F68CEB9F22521B2B00498607 /* ObservingJSEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservingJSEventViewController.swift; sourceTree = "<group>"; };
10092
F6D7DD0C224F62860066C90F /* RxWKUserContentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RxWKUserContentController.swift; sourceTree = "<group>"; };
@@ -115,32 +107,19 @@
115107
buildActionMask = 2147483647;
116108
files = (
117109
42F426D51C6623C5001FED46 /* RxWebKit.framework in Frameworks */,
118-
6B616B2F285CDDC880DAB26F /* Pods_Example.framework in Frameworks */,
119110
);
120111
runOnlyForDeploymentPostprocessing = 0;
121112
};
122113
42F426CA1C6623C5001FED46 /* Frameworks */ = {
123114
isa = PBXFrameworksBuildPhase;
124115
buildActionMask = 2147483647;
125116
files = (
126-
2D9D193AAB6629FC0C06059F /* Pods_RxWebKit.framework in Frameworks */,
127117
);
128118
runOnlyForDeploymentPostprocessing = 0;
129119
};
130120
/* End PBXFrameworksBuildPhase section */
131121

132122
/* Begin PBXGroup section */
133-
38AC8373BCFFF4462AC0FA18 /* Pods */ = {
134-
isa = PBXGroup;
135-
children = (
136-
494317696D9F726E88C1D1C9 /* Pods-Example.debug.xcconfig */,
137-
A06BE07DD958EBAC83F7BA53 /* Pods-Example.release.xcconfig */,
138-
08C4DA7227F508A46FCA1DD6 /* Pods-RxWebKit.debug.xcconfig */,
139-
AA7B81072D217E470FE2C4C9 /* Pods-RxWebKit.release.xcconfig */,
140-
);
141-
name = Pods;
142-
sourceTree = "<group>";
143-
};
144123
42B12EFB1C6DFC7600C280BD /* Sources */ = {
145124
isa = PBXGroup;
146125
children = (
@@ -161,7 +140,6 @@
161140
733B51F3D0F2B4B1E9A99FDC /* Frameworks */,
162141
42F426981C66200D001FED46 /* Products */,
163142
42F426CF1C6623C5001FED46 /* RxWebKit */,
164-
38AC8373BCFFF4462AC0FA18 /* Pods */,
165143
);
166144
sourceTree = "<group>";
167145
};
@@ -219,8 +197,6 @@
219197
children = (
220198
424205831C89E9DF00214DA1 /* RxSwift.framework */,
221199
424205841C89E9DF00214DA1 /* RxCocoa.framework */,
222-
E3C34C58279FC5E2A35DD9F1 /* Pods_Example.framework */,
223-
46FB3C90F3D7D4416B825C36 /* Pods_RxWebKit.framework */,
224200
);
225201
name = Frameworks;
226202
sourceTree = "<group>";
@@ -268,12 +244,10 @@
268244
isa = PBXNativeTarget;
269245
buildConfigurationList = 42F426A91C66200D001FED46 /* Build configuration list for PBXNativeTarget "Example" */;
270246
buildPhases = (
271-
ACCC97C0F898A55387025D34 /* [CP] Check Pods Manifest.lock */,
272247
42F426931C66200D001FED46 /* Sources */,
273248
42F426941C66200D001FED46 /* Frameworks */,
274249
42F426951C66200D001FED46 /* Resources */,
275250
42F426DA1C6623C5001FED46 /* Embed Frameworks */,
276-
35356C7A9C70C337D133CE93 /* [CP] Embed Pods Frameworks */,
277251
);
278252
buildRules = (
279253
);
@@ -289,7 +263,6 @@
289263
isa = PBXNativeTarget;
290264
buildConfigurationList = 42F426D71C6623C5001FED46 /* Build configuration list for PBXNativeTarget "RxWebKit" */;
291265
buildPhases = (
292-
3BD2CAD6CA94D19B987A002C /* [CP] Check Pods Manifest.lock */,
293266
42F426C91C6623C5001FED46 /* Sources */,
294267
42F426CA1C6623C5001FED46 /* Frameworks */,
295268
42F426CB1C6623C5001FED46 /* Headers */,
@@ -381,67 +354,6 @@
381354
};
382355
/* End PBXResourcesBuildPhase section */
383356

384-
/* Begin PBXShellScriptBuildPhase section */
385-
35356C7A9C70C337D133CE93 /* [CP] Embed Pods Frameworks */ = {
386-
isa = PBXShellScriptBuildPhase;
387-
buildActionMask = 2147483647;
388-
files = (
389-
);
390-
inputPaths = (
391-
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
392-
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
393-
"${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework",
394-
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
395-
);
396-
name = "[CP] Embed Pods Frameworks";
397-
outputPaths = (
398-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
399-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
400-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
401-
);
402-
runOnlyForDeploymentPostprocessing = 0;
403-
shellPath = /bin/sh;
404-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
405-
showEnvVarsInLog = 0;
406-
};
407-
3BD2CAD6CA94D19B987A002C /* [CP] Check Pods Manifest.lock */ = {
408-
isa = PBXShellScriptBuildPhase;
409-
buildActionMask = 2147483647;
410-
files = (
411-
);
412-
inputPaths = (
413-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
414-
"${PODS_ROOT}/Manifest.lock",
415-
);
416-
name = "[CP] Check Pods Manifest.lock";
417-
outputPaths = (
418-
"$(DERIVED_FILE_DIR)/Pods-RxWebKit-checkManifestLockResult.txt",
419-
);
420-
runOnlyForDeploymentPostprocessing = 0;
421-
shellPath = /bin/sh;
422-
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";
423-
showEnvVarsInLog = 0;
424-
};
425-
ACCC97C0F898A55387025D34 /* [CP] Check Pods Manifest.lock */ = {
426-
isa = PBXShellScriptBuildPhase;
427-
buildActionMask = 2147483647;
428-
files = (
429-
);
430-
inputPaths = (
431-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
432-
"${PODS_ROOT}/Manifest.lock",
433-
);
434-
name = "[CP] Check Pods Manifest.lock";
435-
outputPaths = (
436-
"$(DERIVED_FILE_DIR)/Pods-Example-checkManifestLockResult.txt",
437-
);
438-
runOnlyForDeploymentPostprocessing = 0;
439-
shellPath = /bin/sh;
440-
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";
441-
showEnvVarsInLog = 0;
442-
};
443-
/* End PBXShellScriptBuildPhase section */
444-
445357
/* Begin PBXSourcesBuildPhase section */
446358
424205751C89E95100214DA1 /* Sources */ = {
447359
isa = PBXSourcesBuildPhase;
@@ -679,7 +591,6 @@
679591
};
680592
42F426AA1C66200D001FED46 /* Debug */ = {
681593
isa = XCBuildConfiguration;
682-
baseConfigurationReference = 494317696D9F726E88C1D1C9 /* Pods-Example.debug.xcconfig */;
683594
buildSettings = {
684595
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
685596
CLANG_ENABLE_MODULES = YES;
@@ -696,7 +607,6 @@
696607
};
697608
42F426AB1C66200D001FED46 /* Release */ = {
698609
isa = XCBuildConfiguration;
699-
baseConfigurationReference = A06BE07DD958EBAC83F7BA53 /* Pods-Example.release.xcconfig */;
700610
buildSettings = {
701611
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
702612
CLANG_ENABLE_MODULES = YES;
@@ -713,7 +623,6 @@
713623
};
714624
42F426D81C6623C5001FED46 /* Debug */ = {
715625
isa = XCBuildConfiguration;
716-
baseConfigurationReference = 08C4DA7227F508A46FCA1DD6 /* Pods-RxWebKit.debug.xcconfig */;
717626
buildSettings = {
718627
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
719628
CLANG_ENABLE_MODULES = YES;
@@ -740,7 +649,6 @@
740649
};
741650
42F426D91C6623C5001FED46 /* Release */ = {
742651
isa = XCBuildConfiguration;
743-
baseConfigurationReference = AA7B81072D217E470FE2C4C9 /* Pods-RxWebKit.release.xcconfig */;
744652
buildSettings = {
745653
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
746654
CLANG_ENABLE_MODULES = YES;

‎RxWebKit.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎RxWebKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)