Skip to content

Commit 1f5170f

Browse files
authored
Merge pull request #249 from freaqed/master
fixed nested framework issue
2 parents cc79d3e + 4ae5471 commit 1f5170f

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

Koloda.xcodeproj/project.pbxproj

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
C517E4F21D9D00520002D88F /* KolodaViewAnimatior.swift in Sources */ = {isa = PBXBuildFile; fileRef = C517E4E81D9D00520002D88F /* KolodaViewAnimatior.swift */; };
1515
C517E4F31D9D00520002D88F /* OverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C517E4EA1D9D00520002D88F /* OverlayView.swift */; };
1616
C517E4F41D9D00520002D88F /* SwipeResultDirection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C517E4EB1D9D00520002D88F /* SwipeResultDirection.swift */; };
17-
C517E4F91D9D01920002D88F /* pop.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C517E4F81D9D01920002D88F /* pop.framework */; };
1817
/* End PBXBuildFile section */
1918

2019
/* Begin PBXFileReference section */
@@ -35,7 +34,6 @@
3534
isa = PBXFrameworksBuildPhase;
3635
buildActionMask = 2147483647;
3736
files = (
38-
C517E4F91D9D01920002D88F /* pop.framework in Frameworks */,
3937
);
4038
runOnlyForDeploymentPostprocessing = 0;
4139
};
@@ -144,7 +142,6 @@
144142
C517E4A71D9CF9010002D88F /* Frameworks */,
145143
C517E4A81D9CF9010002D88F /* Headers */,
146144
C517E4A91D9CF9010002D88F /* Resources */,
147-
C517E4F61D9D01120002D88F /* Carthage */,
148145
);
149146
buildRules = (
150147
);
@@ -197,24 +194,6 @@
197194
};
198195
/* End PBXResourcesBuildPhase section */
199196

200-
/* Begin PBXShellScriptBuildPhase section */
201-
C517E4F61D9D01120002D88F /* Carthage */ = {
202-
isa = PBXShellScriptBuildPhase;
203-
buildActionMask = 2147483647;
204-
files = (
205-
);
206-
inputPaths = (
207-
"$(SRCROOT)/Carthage/Build/iOS/pop.framework",
208-
);
209-
name = Carthage;
210-
outputPaths = (
211-
);
212-
runOnlyForDeploymentPostprocessing = 0;
213-
shellPath = /bin/sh;
214-
shellScript = "/usr/local/bin/carthage copy-frameworks";
215-
};
216-
/* End PBXShellScriptBuildPhase section */
217-
218197
/* Begin PBXSourcesBuildPhase section */
219198
C517E4A61D9CF9010002D88F /* Sources */ = {
220199
isa = PBXSourcesBuildPhase;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KolodaView [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) ![Swift 2.2.x](https://img.shields.io/badge/Swift-2.2.x-orange.svg)
1+
KolodaView [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) ![Swift 3.0.x](https://img.shields.io/badge/Swift-3.0.x-orange.svg)
22
--------------
33

44
[![Yalantis](https://raw.githubusercontent.com/Yalantis/PullToMakeSoup/master/PullToMakeSoupDemo/Resouces/badge_dark.png)](https://Yalantis.com/?utm_source=github)

0 commit comments

Comments
 (0)