Skip to content

Commit e0518bc

Browse files
esttorheesttorhe
authored
🐛 Fixes #46 Carthage build (#47)
* 🐛 Fixes #46 Carthage build Due to a misconfiguration in the project settings when building using Carthage was failing because the project was unable to find RxSwift dependencies * Addresses the infinite recursion issue. Need to double check if this is present on `RxSwift` * Bumped RxSwift Bumped `RxSwift` to latest version and re-enabled the redundancy check flag
1 parent 9fc9da6 commit e0518bc

File tree

5 files changed

+117
-38
lines changed

5 files changed

+117
-38
lines changed

‎Demo/Podfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
22
- Nimble (7.0.1)
33
- Quick (1.1.0)
4-
- RxSwift (3.4.0)
4+
- RxSwift (3.5.0)
55
- RxViewModel (4.0.0):
6-
- RxSwift (~> 3.4)
6+
- RxSwift (~> 3.5.0)
77

88
DEPENDENCIES:
99
- Nimble
@@ -17,8 +17,8 @@ EXTERNAL SOURCES:
1717
SPEC CHECKSUMS:
1818
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
1919
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
20-
RxSwift: 3789a1af753002a14edecdb698a2424624296a9c
21-
RxViewModel: f306c2963ff6978705c07a5c299abc5cc9f9a982
20+
RxSwift: 18ee9d78b45edb3b0b7e79916b47a116e6dbc842
21+
RxViewModel: f9dbd276b3bdc9858cf8ef7cf032fe199ddb27f6
2222

2323
PODFILE CHECKSUM: 5b740ff0f8e82b1a56bee6decd0acad5bd6013b9
2424

‎RxViewModel.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ Long story short: a blatant «imitation» of `ReactiveViewModel `using `RxCocoa`
2525
s.requires_arc = true
2626

2727
s.source_files = 'Source/*.swift', 'Source/Categories/*.swift'
28-
s.dependency 'RxSwift', '~> 3.4'
28+
s.dependency 'RxSwift', '~> 3.5.0'
2929
s.frameworks = 'Foundation'
3030
end

‎RxViewModel.xcodeproj/project.pbxproj

+78-32
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,17 @@
172172
CLANG_ENABLE_OBJC_ARC = YES;
173173
CLANG_WARN_BOOL_CONVERSION = YES;
174174
CLANG_WARN_CONSTANT_CONVERSION = YES;
175-
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
175+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
176176
CLANG_WARN_EMPTY_BODY = YES;
177177
CLANG_WARN_ENUM_CONVERSION = YES;
178+
CLANG_WARN_INFINITE_RECURSION = YES;
178179
CLANG_WARN_INT_CONVERSION = YES;
179-
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
180+
CLANG_WARN_OBJC_ROOT_CLASS = YES;
181+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
180182
CLANG_WARN_UNREACHABLE_CODE = YES;
181183
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
182-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
184+
COMBINE_HIDPI_IMAGES = YES;
183185
COPY_PHASE_STRIP = NO;
184-
CURRENT_PROJECT_VERSION = 1;
185186
DEBUG_INFORMATION_FORMAT = dwarf;
186187
ENABLE_STRICT_OBJC_MSGSEND = YES;
187188
ENABLE_TESTABILITY = YES;
@@ -194,20 +195,16 @@
194195
"$(inherited)",
195196
);
196197
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
197-
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
198+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
198199
GCC_WARN_UNDECLARED_SELECTOR = YES;
199-
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
200+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
200201
GCC_WARN_UNUSED_FUNCTION = YES;
201202
GCC_WARN_UNUSED_VARIABLE = YES;
202-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
203-
MTL_ENABLE_DEBUG_INFO = YES;
204203
ONLY_ACTIVE_ARCH = YES;
205-
SDKROOT = iphoneos;
206-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
207-
SWIFT_VERSION = 3.0;
208-
TARGETED_DEVICE_FAMILY = "1,2";
209-
VERSIONING_SYSTEM = "apple-generic";
210-
VERSION_INFO_PREFIX = "";
204+
SDKROOT = macosx;
205+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
206+
SWIFT_VERSION = "";
207+
TARGETED_DEVICE_FAMILY = "1,2,3,4";
211208
};
212209
name = Debug;
213210
};
@@ -222,71 +219,120 @@
222219
CLANG_ENABLE_OBJC_ARC = YES;
223220
CLANG_WARN_BOOL_CONVERSION = YES;
224221
CLANG_WARN_CONSTANT_CONVERSION = YES;
225-
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
222+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
226223
CLANG_WARN_EMPTY_BODY = YES;
227224
CLANG_WARN_ENUM_CONVERSION = YES;
225+
CLANG_WARN_INFINITE_RECURSION = YES;
228226
CLANG_WARN_INT_CONVERSION = YES;
229-
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
227+
CLANG_WARN_OBJC_ROOT_CLASS = YES;
228+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
230229
CLANG_WARN_UNREACHABLE_CODE = YES;
231230
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
232-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
233-
COPY_PHASE_STRIP = NO;
234-
CURRENT_PROJECT_VERSION = 1;
231+
COMBINE_HIDPI_IMAGES = YES;
232+
COPY_PHASE_STRIP = YES;
235233
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
236234
ENABLE_NS_ASSERTIONS = NO;
237235
ENABLE_STRICT_OBJC_MSGSEND = YES;
238236
GCC_C_LANGUAGE_STANDARD = gnu99;
239237
GCC_NO_COMMON_BLOCKS = YES;
240238
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
241-
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
239+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
242240
GCC_WARN_UNDECLARED_SELECTOR = YES;
243-
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
241+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
244242
GCC_WARN_UNUSED_FUNCTION = YES;
245243
GCC_WARN_UNUSED_VARIABLE = YES;
246-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
247-
MTL_ENABLE_DEBUG_INFO = NO;
248-
SDKROOT = iphoneos;
249-
SWIFT_VERSION = 3.0;
250-
TARGETED_DEVICE_FAMILY = "1,2";
244+
SDKROOT = macosx;
245+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
246+
SWIFT_VERSION = "";
247+
TARGETED_DEVICE_FAMILY = "1,2,3,4";
251248
VALIDATE_PRODUCT = YES;
252-
VERSIONING_SYSTEM = "apple-generic";
253-
VERSION_INFO_PREFIX = "";
254249
};
255250
name = Release;
256251
};
257252
1168B9B91D2E081800784841 /* Debug */ = {
258253
isa = XCBuildConfiguration;
259254
buildSettings = {
255+
APPLICATION_EXTENSION_API_ONLY = YES;
256+
CURRENT_PROJECT_VERSION = 1;
260257
DEFINES_MODULE = YES;
261258
DYLIB_COMPATIBILITY_VERSION = 1;
262259
DYLIB_CURRENT_VERSION = 1;
263260
DYLIB_INSTALL_NAME_BASE = "@rpath";
264-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
265-
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
261+
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
262+
"$(SRCROOT)/Carthage/Build/tvOS/",
263+
"$(inherited)",
264+
);
265+
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
266+
"$(SRCROOT)/Carthage/Build/iOS/",
267+
"$(inherited)",
268+
);
269+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
270+
"$(SRCROOT)/Carthage/Build/Mac/",
271+
"$(inherited)",
272+
);
273+
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
274+
"$(SRCROOT)/Carthage/Build/watchOS/",
275+
"$(inherited)",
276+
);
277+
INFOPLIST_FILE = "Supporting Files/Info.plist";
266278
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
279+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
267280
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
281+
MACOSX_DEPLOYMENT_TARGET = 10.11;
282+
MTL_ENABLE_DEBUG_INFO = YES;
268283
PRODUCT_BUNDLE_IDENTIFIER = es.estebantorr.RxViewModel;
269284
PRODUCT_NAME = "$(TARGET_NAME)";
270285
SKIP_INSTALL = YES;
286+
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
287+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
271288
SWIFT_VERSION = 3.0;
289+
TVOS_DEPLOYMENT_TARGET = 9.0;
290+
VERSIONING_SYSTEM = "apple-generic";
291+
VERSION_INFO_PREFIX = "";
292+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
272293
};
273294
name = Debug;
274295
};
275296
1168B9BA1D2E081800784841 /* Release */ = {
276297
isa = XCBuildConfiguration;
277298
buildSettings = {
299+
APPLICATION_EXTENSION_API_ONLY = YES;
300+
CURRENT_PROJECT_VERSION = 1;
278301
DEFINES_MODULE = YES;
279302
DYLIB_COMPATIBILITY_VERSION = 1;
280303
DYLIB_CURRENT_VERSION = 1;
281304
DYLIB_INSTALL_NAME_BASE = "@rpath";
282-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
283-
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
305+
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
306+
"$(SRCROOT)/Carthage/Build/tvOS/",
307+
"$(inherited)",
308+
);
309+
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
310+
"$(SRCROOT)/Carthage/Build/iOS/",
311+
"$(inherited)",
312+
);
313+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
314+
"$(SRCROOT)/Carthage/Build/Mac/",
315+
"$(inherited)",
316+
);
317+
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
318+
"$(SRCROOT)/Carthage/Build/watchOS/",
319+
"$(inherited)",
320+
);
321+
INFOPLIST_FILE = "Supporting Files/Info.plist";
284322
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
323+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
285324
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
325+
MACOSX_DEPLOYMENT_TARGET = 10.11;
326+
MTL_ENABLE_DEBUG_INFO = NO;
286327
PRODUCT_BUNDLE_IDENTIFIER = es.estebantorr.RxViewModel;
287328
PRODUCT_NAME = "$(TARGET_NAME)";
288329
SKIP_INSTALL = YES;
330+
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
289331
SWIFT_VERSION = 3.0;
332+
TVOS_DEPLOYMENT_TARGET = 9.0;
333+
VERSIONING_SYSTEM = "apple-generic";
334+
VERSION_INFO_PREFIX = "";
335+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
290336
};
291337
name = Release;
292338
};

‎RxViewModel.xcodeproj/xcshareddata/xcschemes/RxViewModel.xcscheme

+33
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@
2020
ReferencedContainer = "container:RxViewModel.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "YES"
27+
buildForArchiving = "YES"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "8896EB181F12B5AB00B4852F"
32+
BuildableName = "RxViewModelTests.xctest"
33+
BlueprintName = "RxViewModelTests"
34+
ReferencedContainer = "container:RxViewModel.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
2337
</BuildActionEntries>
2438
</BuildAction>
2539
<TestAction
@@ -28,7 +42,26 @@
2842
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2943
shouldUseLaunchSchemeArgsEnv = "YES">
3044
<Testables>
45+
<TestableReference
46+
skipped = "NO">
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "8896EB181F12B5AB00B4852F"
50+
BuildableName = "RxViewModelTests.xctest"
51+
BlueprintName = "RxViewModelTests"
52+
ReferencedContainer = "container:RxViewModel.xcodeproj">
53+
</BuildableReference>
54+
</TestableReference>
3155
</Testables>
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "1168B9AF1D2E081800784841"
60+
BuildableName = "RxViewModel.framework"
61+
BlueprintName = "RxViewModel"
62+
ReferencedContainer = "container:RxViewModel.xcodeproj">
63+
</BuildableReference>
64+
</MacroExpansion>
3265
<AdditionalOptions>
3366
</AdditionalOptions>
3467
</TestAction>

‎Supporting Files/RxViewModel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2016 Esteban Torres. All rights reserved.
77
//
88

9-
#import <UIKit/UIKit.h>
9+
#import <Foundation/Foundation.h>
1010

1111
//! Project version number for RxViewModel.
1212
FOUNDATION_EXPORT double RxViewModelVersionNumber;

0 commit comments

Comments
 (0)