Skip to content
This repository has been archived by the owner on Aug 23, 2021. It is now read-only.

Use Carthage for dependencies #7

Merged
merged 7 commits into from
Jun 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ Pods/
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/Checkouts

Carthage/Build
1 change: 1 addition & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "facebook/KVOController"
2 changes: 2 additions & 0 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "Quick/Nimble"
github "Quick/Quick"
3 changes: 3 additions & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
github "facebook/KVOController" "v1.1.0"
github "Quick/Nimble" "v4.0.1"
github "Quick/Quick" "v0.9.2"
81 changes: 2 additions & 79 deletions Gaikan.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
49EC398B1B93085E002938E1 /* StyleRule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49EC398A1B93085E002938E1 /* StyleRule.swift */; };
49EC39931B9373B2002938E1 /* Stylable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49EC39921B9373B2002938E1 /* Stylable.swift */; };
49FD8A651CD16652004F2979 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49FD8A631CD16652004F2979 /* Theme.swift */; };
593205EC54C9AFF876D912B2 /* Pods_GaikanTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58FCFF7171F4F384215361A2 /* Pods_GaikanTests.framework */; };
CAFCDA4F1C592BBC004513D3 /* Corners.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFCDA4E1C592BBC004513D3 /* Corners.swift */; };
/* End PBXBuildFile section */

Expand All @@ -72,7 +71,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
3971B328ADBE03773776917F /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
420190831C80B4BB00B70169 /* UINavigationBarSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UINavigationBarSpec.swift; sourceTree = "<group>"; };
420190851C80B60F00B70169 /* UINavigationBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UINavigationBar.swift; sourceTree = "<group>"; };
42087B211C9AE4B8000606A7 /* VirtualView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VirtualView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -120,10 +118,7 @@
49EC39751B92FC7D002938E1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
49EC398A1B93085E002938E1 /* StyleRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyleRule.swift; sourceTree = "<group>"; };
49EC39921B9373B2002938E1 /* Stylable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stylable.swift; sourceTree = "<group>"; };
49F93D713838E2D8C15F2D70 /* Pods-GaikanTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GaikanTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-GaikanTests/Pods-GaikanTests.release.xcconfig"; sourceTree = "<group>"; };
49FD8A631CD16652004F2979 /* Theme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
58FCFF7171F4F384215361A2 /* Pods_GaikanTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GaikanTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8E1E5EEB5FAF534C619EC20B /* Pods-GaikanTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GaikanTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GaikanTests/Pods-GaikanTests.debug.xcconfig"; sourceTree = "<group>"; };
CAFCDA4E1C592BBC004513D3 /* Corners.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Corners.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -147,7 +142,6 @@
buildActionMask = 2147483647;
files = (
49EC396F1B92FC7D002938E1 /* Gaikan.framework in Frameworks */,
593205EC54C9AFF876D912B2 /* Pods_GaikanTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -309,8 +303,6 @@
49EC39721B92FC7D002938E1 /* GaikanTests */,
498E05371B98362100B4E26B /* Sample */,
49EC39651B92FC7D002938E1 /* Products */,
E494329BB65FAF1563EC681F /* Frameworks */,
97E0955C1C774D94F578914F /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -371,24 +363,6 @@
path = Theme;
sourceTree = "<group>";
};
97E0955C1C774D94F578914F /* Pods */ = {
isa = PBXGroup;
children = (
8E1E5EEB5FAF534C619EC20B /* Pods-GaikanTests.debug.xcconfig */,
49F93D713838E2D8C15F2D70 /* Pods-GaikanTests.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
E494329BB65FAF1563EC681F /* Frameworks */ = {
isa = PBXGroup;
children = (
3971B328ADBE03773776917F /* Pods.framework */,
58FCFF7171F4F384215361A2 /* Pods_GaikanTests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -443,12 +417,9 @@
isa = PBXNativeTarget;
buildConfigurationList = 49EC397B1B92FC7D002938E1 /* Build configuration list for PBXNativeTarget "GaikanTests" */;
buildPhases = (
82AB79BE49E9724D56032A56 /* Check Pods Manifest.lock */,
49EC396A1B92FC7D002938E1 /* Sources */,
49EC396B1B92FC7D002938E1 /* Frameworks */,
49EC396C1B92FC7D002938E1 /* Resources */,
89F01B81AF3AF93718CF0FED /* Embed Pods Frameworks */,
957D058894CB8D7F092907C9 /* Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -528,54 +499,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
82AB79BE49E9724D56032A56 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
89F01B81AF3AF93718CF0FED /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GaikanTests/Pods-GaikanTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
957D058894CB8D7F092907C9 /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GaikanTests/Pods-GaikanTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
498E05321B98362100B4E26B /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -719,6 +642,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -767,6 +691,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down Expand Up @@ -822,7 +747,6 @@
};
49EC397C1B92FC7D002938E1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8E1E5EEB5FAF534C619EC20B /* Pods-GaikanTests.debug.xcconfig */;
buildSettings = {
INFOPLIST_FILE = GaikanTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -833,7 +757,6 @@
};
49EC397D1B92FC7D002938E1 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 49F93D713838E2D8C15F2D70 /* Pods-GaikanTests.release.xcconfig */;
buildSettings = {
INFOPLIST_FILE = GaikanTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand Down
10 changes: 0 additions & 10 deletions Gaikan.xcworkspace/contents.xcworkspacedata

This file was deleted.

8 changes: 0 additions & 8 deletions Gaikan.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

This file was deleted.

9 changes: 0 additions & 9 deletions Podfile

This file was deleted.

18 changes: 0 additions & 18 deletions Podfile.lock

This file was deleted.

18 changes: 0 additions & 18 deletions Pods/Manifest.lock

This file was deleted.

Loading