TouchInstinct
/
LeadKit
304
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15 from TouchInstinct/bugfix/podspec_dependencies 

Bugfix/podspec dependencies
This commit is contained in:
Nikolai Ashanin 2016-08-12 12:49:58 +03:00 committed by GitHub
parent b9a6bfed41 e23573e904
commit 0ece2d8042
8 changed files with 43 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "LeadKit/RxAlamofire"]
path = LeadKit/RxAlamofire
url = https://github.com/RxSwiftCommunity/RxAlamofire

8
Cartfile
View File

@ -1,3 +1,5 @@
github "CocoaLumberjack/CocoaLumberjack"
github "ReactiveX/RxSwift"
github "lyft/mapper"
github "CocoaLumberjack/CocoaLumberjack" ~> 2.2
github "ReactiveX/RxSwift" ~> 2.6
github "lyft/mapper" ~> 3.0
github "Alamofire/Alamofire" ~> 3.4
github "RxSwiftCommunity/RxAlamofire" ~> 1.1

2
Cartfile.resolved
View File

@ -1,3 +1,5 @@
github "Alamofire/Alamofire" "3.4.1"
github "CocoaLumberjack/CocoaLumberjack" "2.3.0"
github "ReactiveX/RxSwift" "2.6.0"
github "lyft/mapper" "3.0.0"
github "RxSwiftCommunity/RxAlamofire" "1.2"

6
LeadKit.podspec
View File

@ -11,5 +11,9 @@ Pod::Spec.new do |s|
s.source_files = "LeadKit/LeadKit/**/*.swift"
s.dependency "CocoaLumberjack/Swift", '~> 2.2'
s.dependency "AlamofireObjectMapper", '~> 3.0'
s.dependency "ModelMapper", '~> 3.0'
s.dependency "RxSwift", '~> 2.6'
s.dependency "RxCocoa", '~> 2.6'
s.dependency "Alamofire", '~> 3.4'
s.dependency "RxAlamofire", '~> 1.1'
end

BIN
LeadKit/.DS_Store vendored Normal file
View File

Binary file not shown.

82
LeadKit/LeadKit.xcodeproj/project.pbxproj
View File

@ -7,13 +7,13 @@
objects = {
/* Begin PBXBuildFile section */
0A3BB96F1D5DCFE100B03CBD /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A3BB96B1D5DCFE100B03CBD /* CocoaLumberjack.framework */; };
0A3BB9701D5DCFE100B03CBD /* Mapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A3BB96C1D5DCFE100B03CBD /* Mapper.framework */; };
0A3BB9711D5DCFE100B03CBD /* RxAlamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A3BB96D1D5DCFE100B03CBD /* RxAlamofire.framework */; };
0A3BB9721D5DCFE100B03CBD /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A3BB96E1D5DCFE100B03CBD /* RxSwift.framework */; };
0A3BB9741D5DCFEC00B03CBD /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A3BB9731D5DCFEC00B03CBD /* RxCocoa.framework */; };
78011A641D47ABC500EA16A2 /* UIView+DefaultReuseIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78011A631D47ABC500EA16A2 /* UIView+DefaultReuseIdentifier.swift */; };
78011A691D47AF5100EA16A2 /* CellCreationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78011A681D47AF5100EA16A2 /* CellCreationType.swift */; };
78011A751D48AC2500EA16A2 /* NSURLSession+RxAlamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78011A731D48AC2500EA16A2 /* NSURLSession+RxAlamofire.swift */; };
78011A761D48AC2500EA16A2 /* RxAlamofire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78011A741D48AC2500EA16A2 /* RxAlamofire.swift */; };
78011A7B1D48ADFF00EA16A2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 78011A771D48ADFF00EA16A2 /* Alamofire.framework */; };
78011A7D1D48ADFF00EA16A2 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 78011A791D48ADFF00EA16A2 /* RxCocoa.framework */; };
78011A7E1D48ADFF00EA16A2 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 78011A7A1D48ADFF00EA16A2 /* RxSwift.framework */; };
78011AB31D48B53600EA16A2 /* ApiRequestParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78011AB21D48B53600EA16A2 /* ApiRequestParameters.swift */; };
7824CA521CFEE6B700D7B132 /* UIImage+RenderTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7824CA511CFEE6B700D7B132 /* UIImage+RenderTemplate.swift */; };
7837F60F1CBCF5C0000D74C1 /* EstimatedViewHeightProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7837F60E1CBCF5C0000D74C1 /* EstimatedViewHeightProtocol.swift */; };
@ -23,11 +23,9 @@
786D78EA1D53C43E006B2CEA /* ApiError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 786D78E91D53C43E006B2CEA /* ApiError.swift */; };
786D78EC1D53C46E006B2CEA /* AlamofireManager+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 786D78EB1D53C46E006B2CEA /* AlamofireManager+Extensions.swift */; };
787682FA1CAD40C300532AB3 /* StaticEstimatedViewHeightProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 787682F91CAD40C200532AB3 /* StaticEstimatedViewHeightProtocol.swift */; };
787768921D53600600C20604 /* Mapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 787768911D53600600C20604 /* Mapper.framework */; };
787783631CA03CA0001CDC9B /* NSIndexPath+ImmutableIndexPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 787783621CA03CA0001CDC9B /* NSIndexPath+ImmutableIndexPath.swift */; };
787783671CA04D4A001CDC9B /* NSString+SizeCalculation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 787783661CA04D4A001CDC9B /* NSString+SizeCalculation.swift */; };
787A071A1D085750009EC97F /* CellsControllerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 787A07191D085750009EC97F /* CellsControllerProtocol.swift */; };
787A071E1D08790B009EC97F /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 787A071D1D08790B009EC97F /* CocoaLumberjack.framework */; };
788EC15A1CF64528009CFB6B /* UIStoryboard+InstantiateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 788EC1591CF64528009CFB6B /* UIStoryboard+InstantiateViewController.swift */; };
78A74EA91C6B373700FE9724 /* UIView+DefaultNibName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A74EA81C6B373700FE9724 /* UIView+DefaultNibName.swift */; };
78B0FC7D1C6B2BE200358B64 /* LogFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B0FC7C1C6B2BE200358B64 /* LogFormatter.swift */; };
@ -61,13 +59,13 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
0A3BB96B1D5DCFE100B03CBD /* CocoaLumberjack.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CocoaLumberjack.framework; sourceTree = "<group>"; };
0A3BB96C1D5DCFE100B03CBD /* Mapper.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Mapper.framework; sourceTree = "<group>"; };
0A3BB96D1D5DCFE100B03CBD /* RxAlamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RxAlamofire.framework; sourceTree = "<group>"; };
0A3BB96E1D5DCFE100B03CBD /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RxSwift.framework; sourceTree = "<group>"; };
0A3BB9731D5DCFEC00B03CBD /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RxCocoa.framework; sourceTree = "<group>"; };
78011A631D47ABC500EA16A2 /* UIView+DefaultReuseIdentifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+DefaultReuseIdentifier.swift"; sourceTree = "<group>"; };
78011A681D47AF5100EA16A2 /* CellCreationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CellCreationType.swift; sourceTree = "<group>"; };
78011A731D48AC2500EA16A2 /* NSURLSession+RxAlamofire.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURLSession+RxAlamofire.swift"; sourceTree = "<group>"; };
78011A741D48AC2500EA16A2 /* RxAlamofire.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxAlamofire.swift; sourceTree = "<group>"; };
78011A771D48ADFF00EA16A2 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = ../../../Carthage/Build/iOS/Alamofire.framework; sourceTree = "<group>"; };
78011A791D48ADFF00EA16A2 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = ../../../Carthage/Build/iOS/RxCocoa.framework; sourceTree = "<group>"; };
78011A7A1D48ADFF00EA16A2 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = ../../../Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
78011AB21D48B53600EA16A2 /* ApiRequestParameters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApiRequestParameters.swift; sourceTree = "<group>"; };
7824CA511CFEE6B700D7B132 /* UIImage+RenderTemplate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+RenderTemplate.swift"; sourceTree = "<group>"; };
7837F60E1CBCF5C0000D74C1 /* EstimatedViewHeightProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EstimatedViewHeightProtocol.swift; sourceTree = "<group>"; };
@ -77,11 +75,9 @@
786D78E91D53C43E006B2CEA /* ApiError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApiError.swift; sourceTree = "<group>"; };
786D78EB1D53C46E006B2CEA /* AlamofireManager+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AlamofireManager+Extensions.swift"; sourceTree = "<group>"; };
787682F91CAD40C200532AB3 /* StaticEstimatedViewHeightProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StaticEstimatedViewHeightProtocol.swift; sourceTree = "<group>"; };
787768911D53600600C20604 /* Mapper.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mapper.framework; path = ../../../Carthage/Build/iOS/Mapper.framework; sourceTree = "<group>"; };
787783621CA03CA0001CDC9B /* NSIndexPath+ImmutableIndexPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSIndexPath+ImmutableIndexPath.swift"; sourceTree = "<group>"; };
787783661CA04D4A001CDC9B /* NSString+SizeCalculation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSString+SizeCalculation.swift"; sourceTree = "<group>"; };
787A07191D085750009EC97F /* CellsControllerProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CellsControllerProtocol.swift; sourceTree = "<group>"; };
787A071D1D08790B009EC97F /* CocoaLumberjack.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaLumberjack.framework; path = ../../../Carthage/Build/iOS/CocoaLumberjack.framework; sourceTree = "<group>"; };
788EC1591CF64528009CFB6B /* UIStoryboard+InstantiateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIStoryboard+InstantiateViewController.swift"; sourceTree = "<group>"; };
78A74EA81C6B373700FE9724 /* UIView+DefaultNibName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIView+DefaultNibName.swift"; path = "LeadKit/Extensions/UIView/UIView+DefaultNibName.swift"; sourceTree = SOURCE_ROOT; };
78B0FC7C1C6B2BE200358B64 /* LogFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogFormatter.swift; sourceTree = "<group>"; };
@ -112,11 +108,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
78011A7E1D48ADFF00EA16A2 /* RxSwift.framework in Frameworks */,
78011A7D1D48ADFF00EA16A2 /* RxCocoa.framework in Frameworks */,
787A071E1D08790B009EC97F /* CocoaLumberjack.framework in Frameworks */,
787768921D53600600C20604 /* Mapper.framework in Frameworks */,
78011A7B1D48ADFF00EA16A2 /* Alamofire.framework in Frameworks */,
0A3BB9721D5DCFE100B03CBD /* RxSwift.framework in Frameworks */,
0A3BB96F1D5DCFE100B03CBD /* CocoaLumberjack.framework in Frameworks */,
0A3BB9701D5DCFE100B03CBD /* Mapper.framework in Frameworks */,
0A3BB9741D5DCFEC00B03CBD /* RxCocoa.framework in Frameworks */,
0A3BB9711D5DCFE100B03CBD /* RxAlamofire.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -131,6 +127,18 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
0A3BB96A1D5DCFBD00B03CBD /* Frameworks */ = {
isa = PBXGroup;
children = (
0A3BB9731D5DCFEC00B03CBD /* RxCocoa.framework */,
0A3BB96B1D5DCFE100B03CBD /* CocoaLumberjack.framework */,
0A3BB96C1D5DCFE100B03CBD /* Mapper.framework */,
0A3BB96D1D5DCFE100B03CBD /* RxAlamofire.framework */,
0A3BB96E1D5DCFE100B03CBD /* RxSwift.framework */,
);
path = Frameworks;
sourceTree = "<group>";
};
78011A651D47AF3000EA16A2 /* Enums */ = {
isa = PBXGroup;
children = (
@ -140,24 +148,6 @@
path = Enums;
sourceTree = "<group>";
};
78011A711D48AC2500EA16A2 /* RxAlamofire */ = {
isa = PBXGroup;
children = (
78011A721D48AC2500EA16A2 /* Cocoa */,
78011A741D48AC2500EA16A2 /* RxAlamofire.swift */,
);
name = RxAlamofire;
path = RxAlamofire/RxAlamofire/Source;
sourceTree = "<group>";
};
78011A721D48AC2500EA16A2 /* Cocoa */ = {
isa = PBXGroup;
children = (
78011A731D48AC2500EA16A2 /* NSURLSession+RxAlamofire.swift */,
);
path = Cocoa;
sourceTree = "<group>";
};
78011AAE1D48B46100EA16A2 /* Structures */ = {
isa = PBXGroup;
children = (
@ -174,18 +164,6 @@
path = Api;
sourceTree = "<group>";
};
7830C4131C6B336A00180D02 /* Frameworks */ = {
isa = PBXGroup;
children = (
787A071D1D08790B009EC97F /* CocoaLumberjack.framework */,
78011A7A1D48ADFF00EA16A2 /* RxSwift.framework */,
78011A791D48ADFF00EA16A2 /* RxCocoa.framework */,
78011A771D48ADFF00EA16A2 /* Alamofire.framework */,
787768911D53600600C20604 /* Mapper.framework */,
);
path = Frameworks;
sourceTree = "<group>";
};
785C33431CFC89EF00C4C4AA /* Controllers */ = {
isa = PBXGroup;
children = (
@ -243,7 +221,6 @@
78CFEE201C5C456B00F50370 = {
isa = PBXGroup;
children = (
78011A711D48AC2500EA16A2 /* RxAlamofire */,
78CFEE2C1C5C456B00F50370 /* LeadKit */,
78CFEE381C5C456B00F50370 /* LeadKitTests */,
78CFEE2B1C5C456B00F50370 /* Products */,
@ -262,7 +239,7 @@
78CFEE2C1C5C456B00F50370 /* LeadKit */ = {
isa = PBXGroup;
children = (
7830C4131C6B336A00180D02 /* Frameworks */,
0A3BB96A1D5DCFBD00B03CBD /* Frameworks */,
78A74EAA1C6B401800FE9724 /* Classes */,
78011AAE1D48B46100EA16A2 /* Structures */,
78CFEE441C5C45E500F50370 /* Extensions */,
@ -505,6 +482,7 @@
"$(SRCROOT)/../Carthage/Build/iOS/RxCocoa.framework",
"$(SRCROOT)/../Carthage/Build/iOS/Alamofire.framework",
"$(SRCROOT)/../Carthage/Build/iOS/Mapper.framework",
"$(SRCROOT)/../Carthage/Build/iOS/RxAlamofire.framework",
);
name = "Carthage copy-frameworks";
outputPaths = (
@ -544,13 +522,11 @@
7824CA521CFEE6B700D7B132 /* UIImage+RenderTemplate.swift in Sources */,
78CFEE5A1C5C45E500F50370 /* ViewHeightProtocol.swift in Sources */,
787682FA1CAD40C300532AB3 /* StaticEstimatedViewHeightProtocol.swift in Sources */,
78011A761D48AC2500EA16A2 /* RxAlamofire.swift in Sources */,
78A74EA91C6B373700FE9724 /* UIView+DefaultNibName.swift in Sources */,
786A17A11CB8D71D007F9661 /* UIImage+CapInsetsUtils.swift in Sources */,
78CFEE581C5C45E500F50370 /* StaticViewHeightProtocol.swift in Sources */,
787783631CA03CA0001CDC9B /* NSIndexPath+ImmutableIndexPath.swift in Sources */,
78CFEE591C5C45E500F50370 /* StoryboardIdentifierProtocol.swift in Sources */,
78011A751D48AC2500EA16A2 /* NSURLSession+RxAlamofire.swift in Sources */,
78011AB31D48B53600EA16A2 /* ApiRequestParameters.swift in Sources */,
78B0FC7D1C6B2BE200358B64 /* LogFormatter.swift in Sources */,
);

1
LeadKit/LeadKit/Extensions/Alamofire/AlamofireManager+Extensions.swift
View File

@ -8,6 +8,7 @@
import Alamofire
import RxSwift
import RxAlamofire
public extension Alamofire.Manager {

1
LeadKit/LeadKit/Extensions/Alamofire/AlamofireRequest+Extensions.swift
View File

@ -9,6 +9,7 @@
import Alamofire
import RxSwift
import Mapper
import RxAlamofire
public extension Alamofire.Request {