Skip to content

Commit

Permalink
Moving LKEnvironment into LKAPI
Browse files Browse the repository at this point in the history
  • Loading branch information
Erik Sargent committed May 2, 2016
1 parent a8f6a44 commit 9b76c12
Show file tree
Hide file tree
Showing 35 changed files with 2,282 additions and 1,226 deletions.
8 changes: 8 additions & 0 deletions Example/LKAPI.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
607FACEC1AFB9204008FA782 /* APITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* APITests.swift */; };
6FBF4E879B7EC7D0D10759FB /* Pods_LKAPI_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DDE5DACBF32E6149F164429 /* Pods_LKAPI_Tests.framework */; };
BFA5E1941CD7E8C40041CF6E /* EnvironmentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA5E1931CD7E8C40041CF6E /* EnvironmentTests.swift */; };
BFA5E1961CD7EA0D0041CF6E /* LKAPI-Example-Env.plist in Resources */ = {isa = PBXBuildFile; fileRef = BFA5E1951CD7EA0D0041CF6E /* LKAPI-Example-Env.plist */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -21,6 +23,8 @@
7DDE5DACBF32E6149F164429 /* Pods_LKAPI_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LKAPI_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8642178C40AD8705BC647625 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
AF213812B10805C7C6D522F1 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
BFA5E1931CD7E8C40041CF6E /* EnvironmentTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnvironmentTests.swift; sourceTree = "<group>"; };
BFA5E1951CD7EA0D0041CF6E /* LKAPI-Example-Env.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "LKAPI-Example-Env.plist"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -75,7 +79,9 @@
isa = PBXGroup;
children = (
607FACEB1AFB9204008FA782 /* APITests.swift */,
BFA5E1931CD7E8C40041CF6E /* EnvironmentTests.swift */,
607FACE91AFB9204008FA782 /* Supporting Files */,
BFA5E1951CD7EA0D0041CF6E /* LKAPI-Example-Env.plist */,
);
path = Tests;
sourceTree = "<group>";
Expand Down Expand Up @@ -160,6 +166,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BFA5E1961CD7EA0D0041CF6E /* LKAPI-Example-Env.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -219,6 +226,7 @@
buildActionMask = 2147483647;
files = (
607FACEC1AFB9204008FA782 /* APITests.swift in Sources */,
BFA5E1941CD7E8C40041CF6E /* EnvironmentTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 1 addition & 3 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ use_frameworks!

target 'LKAPI_Tests', :exclusive => true do
pod 'LKAPI', :path => '../'

pod 'LKEnvironment'

pod 'Alamofire'
end
13 changes: 5 additions & 8 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
PODS:
- Alamofire (3.2.0)
- LKAPI (0.1.0):
- Alamofire (3.3.1)
- LKAPI (0.1.3):
- Alamofire
- LKEnvironment
- LKEnvironment (0.1.1)

DEPENDENCIES:
- Alamofire
- LKAPI (from `../`)
- LKEnvironment

EXTERNAL SOURCES:
LKAPI:
:path: ../

SPEC CHECKSUMS:
Alamofire: 4da478599fccddff361205c8929333d7fe18dceb
LKAPI: e417b67bbff86b3f951fcbb74231794f2fd2cd5c
LKEnvironment: 1815f15ba8979f84d78808199912b77c239699ca
Alamofire: 369bc67b6f5ac33ded3648d7bd21c5bfb91c2ecc
LKAPI: 59866423b4448872e1a3e500056888889913fa48

COCOAPODS: 0.39.0
15 changes: 8 additions & 7 deletions Example/Pods/Alamofire/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 79 additions & 21 deletions Example/Pods/Alamofire/Source/Manager.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9b76c12

Please sign in to comment.