Skip to content

Commit

Permalink
🐛 Fixes #46 Carthage build (#47)
Browse files Browse the repository at this point in the history 
* 🐛 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
  • Loading branch information
@esttorhe
esttorhe authored Jul 10, 2017
1 parent 9fc9da6 commit e0518bc
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 38 deletions.
8 changes: 4 additions & 4 deletions Demo/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PODS:
- Nimble (7.0.1)
- Quick (1.1.0)
- RxSwift (3.4.0)
- RxSwift (3.5.0)
- RxViewModel (4.0.0):
- RxSwift (~> 3.4)
- RxSwift (~> 3.5.0)

DEPENDENCIES:
- Nimble
Expand All @@ -17,8 +17,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
RxSwift: 3789a1af753002a14edecdb698a2424624296a9c
RxViewModel: f306c2963ff6978705c07a5c299abc5cc9f9a982
RxSwift: 18ee9d78b45edb3b0b7e79916b47a116e6dbc842
RxViewModel: f9dbd276b3bdc9858cf8ef7cf032fe199ddb27f6

PODFILE CHECKSUM: 5b740ff0f8e82b1a56bee6decd0acad5bd6013b9

Expand Down
2 changes: 1 addition & 1 deletion RxViewModel.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ Long story short: a blatant «imitation» of `ReactiveViewModel `using `RxCocoa`
s.requires_arc = true

s.source_files = 'Source/*.swift', 'Source/Categories/*.swift'
s.dependency 'RxSwift', '~> 3.4'
s.dependency 'RxSwift', '~> 3.5.0'
s.frameworks = 'Foundation'
end
110 changes: 78 additions & 32 deletions RxViewModel.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,17 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand All @@ -194,20 +195,16 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = "";
TARGETED_DEVICE_FAMILY = "1,2,3,4";
};
name = Debug;
};
Expand All @@ -222,71 +219,120 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = "";
TARGETED_DEVICE_FAMILY = "1,2,3,4";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
1168B9B91D2E081800784841 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
"$(SRCROOT)/Carthage/Build/tvOS/",
"$(inherited)",
);
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
"$(SRCROOT)/Carthage/Build/iOS/",
"$(inherited)",
);
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
"$(SRCROOT)/Carthage/Build/Mac/",
"$(inherited)",
);
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
"$(SRCROOT)/Carthage/Build/watchOS/",
"$(inherited)",
);
INFOPLIST_FILE = "Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = es.estebantorr.RxViewModel;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
name = Debug;
};
1168B9BA1D2E081800784841 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
"$(SRCROOT)/Carthage/Build/tvOS/",
"$(inherited)",
);
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
"$(SRCROOT)/Carthage/Build/iOS/",
"$(inherited)",
);
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
"$(SRCROOT)/Carthage/Build/Mac/",
"$(inherited)",
);
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
"$(SRCROOT)/Carthage/Build/watchOS/",
"$(inherited)",
);
INFOPLIST_FILE = "Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = es.estebantorr.RxViewModel;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
SWIFT_VERSION = 3.0;
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
name = Release;
};
Expand Down
33 changes: 33 additions & 0 deletions RxViewModel.xcodeproj/xcshareddata/xcschemes/RxViewModel.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@
ReferencedContainer = "container:RxViewModel.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8896EB181F12B5AB00B4852F"
BuildableName = "RxViewModelTests.xctest"
BlueprintName = "RxViewModelTests"
ReferencedContainer = "container:RxViewModel.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand All @@ -28,7 +42,26 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8896EB181F12B5AB00B4852F"
BuildableName = "RxViewModelTests.xctest"
BlueprintName = "RxViewModelTests"
ReferencedContainer = "container:RxViewModel.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1168B9AF1D2E081800784841"
BuildableName = "RxViewModel.framework"
BlueprintName = "RxViewModel"
ReferencedContainer = "container:RxViewModel.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand Down
2 changes: 1 addition & 1 deletion Supporting Files/RxViewModel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2016 Esteban Torres. All rights reserved.
//

#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>

//! Project version number for RxViewModel.
FOUNDATION_EXPORT double RxViewModelVersionNumber;
Expand Down

0 comments on commit e0518bc

Please sign in to comment.