GitHub/SlackKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use submodule to handle core dependency"

Browse Source 
This reverts commit edf56e1678.
This commit is contained in:
Peter Zignego
2016-05-15 15:25:36 -04:00
parent edf56e1678
commit 35dfa840e8
6 changed files with 26 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -1
View File
@@ -28,10 +28,11 @@ Packages/
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
Pods/
SlackKit.xcworkspace
Podfile.lock
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
Carthage/Checkouts
Carthage/Build
Cartfile.resolved
.gitmodules
-3
View File
@@ -1,3 +0,0 @@
[submodule "Starscream"]
path = Starscream
url = https://github.com/daltoniam/Starscream.git
Podfile.lock
-12
View File
@@ -1,12 +0,0 @@
PODS:
- Starscream (1.1.3)
DEPENDENCIES:
- Starscream
SPEC CHECKSUMS:
Starscream: d662732354b40dd19ed1ece3e3c44c80b536b83c
PODFILE CHECKSUM: d22778f772dbbded8b17fbebf5fa1c879d785aee
COCOAPODS: 1.0.0
SlackKit.xcodeproj/project.pbxproj
+24 -111
View File
@@ -70,51 +70,6 @@
4307A0801CC6D0910011D5DE /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4307A07F1CC6D0910011D5DE /* Starscream.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
26663EE31CE9020E0005F204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6B3E79E619D48B7F006071F7;
remoteInfo = "Starscream iOS";
};
26663EE51CE9020E0005F204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6B3E79F119D48B7F006071F7;
remoteInfo = "Starscream iOSTests";
};
26663EE71CE9020E0005F204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = D9C3E35F19E48FF1009FC285;
remoteInfo = "Starscream OSX";
};
26663EE91CE9020E0005F204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = D9C3E36919E48FF1009FC285;
remoteInfo = "Starscream OSXTests";
};
26663EEB1CE9020E0005F204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 091277971BD673A70003036D;
remoteInfo = "Starscream tvOS";
};
26663EED1CE9020E0005F204 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 091277A01BD673A70003036D;
remoteInfo = "Starscream tvOSTests";
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
2601D61A1C7646B80012BF22 /* SlackWebAPIErrorDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SlackWebAPIErrorDispatcher.swift; path = Sources/SlackWebAPIErrorDispatcher.swift; sourceTree = "<group>"; };
2601D6241C7688610012BF22 /* OSX-Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OSX-Sample.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -127,7 +82,6 @@
260EC2311C4DC61D0093B253 /* NetworkInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NetworkInterface.swift; path = Sources/NetworkInterface.swift; sourceTree = "<group>"; };
260EC2321C4DC61D0093B253 /* SlackWebAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SlackWebAPI.swift; path = Sources/SlackWebAPI.swift; sourceTree = "<group>"; };
2661A6A41BBF62FF0026F67B /* SlackKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlackKit.h; sourceTree = "<group>"; };
26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = Starscream/Starscream.xcodeproj; sourceTree = "<group>"; };
268E45F41CE8EC8C009F19CC /* SlackKit_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
268E46111CE8ECB3009F19CC /* SlackKit_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
268E46131CE8F79D009F19CC /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-iOS.plist"; path = "Supporting Files/Info-iOS.plist"; sourceTree = "<group>"; };
@@ -201,7 +155,6 @@
26072A2A1BB48B3A00CD650C = {
isa = PBXGroup;
children = (
26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */,
2661A6811BBF60E60026F67B /* SlackKit */,
2601D6251C7688610012BF22 /* OSX-Sample */,
26072A351BB48B3A00CD650C /* Products */,
@@ -246,19 +199,6 @@
path = SlackKit;
sourceTree = "<group>";
};
26663EDB1CE9020E0005F204 /* Products */ = {
isa = PBXGroup;
children = (
26663EE41CE9020E0005F204 /* Starscream.framework */,
26663EE61CE9020E0005F204 /* Starscream iOSTests.xctest */,
26663EE81CE9020E0005F204 /* Starscream.framework */,
26663EEA1CE9020E0005F204 /* Starscream OSXTests.xctest */,
26663EEC1CE9020E0005F204 /* Starscream.framework */,
26663EEE1CE9020E0005F204 /* Starscream tvOSTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
268E46161CE8F7A2009F19CC /* Supporting Files */ = {
isa = PBXGroup;
children = (
@@ -405,12 +345,6 @@
mainGroup = 26072A2A1BB48B3A00CD650C;
productRefGroup = 26072A351BB48B3A00CD650C /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 26663EDB1CE9020E0005F204 /* Products */;
ProjectRef = 26663EDA1CE9020E0005F204 /* Starscream.xcodeproj */;
},
);
projectRoot = "";
targets = (
26072A331BB48B3A00CD650C /* SlackKit */,
@@ -421,51 +355,6 @@
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
26663EE41CE9020E0005F204 /* Starscream.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Starscream.framework;
remoteRef = 26663EE31CE9020E0005F204 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26663EE61CE9020E0005F204 /* Starscream iOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Starscream iOSTests.xctest";
remoteRef = 26663EE51CE9020E0005F204 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26663EE81CE9020E0005F204 /* Starscream.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Starscream.framework;
remoteRef = 26663EE71CE9020E0005F204 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26663EEA1CE9020E0005F204 /* Starscream OSXTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Starscream OSXTests.xctest";
remoteRef = 26663EE91CE9020E0005F204 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26663EEC1CE9020E0005F204 /* Starscream.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Starscream.framework;
remoteRef = 26663EEB1CE9020E0005F204 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26663EEE1CE9020E0005F204 /* Starscream tvOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Starscream tvOSTests.xctest";
remoteRef = 26663EED1CE9020E0005F204 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
2601D6221C7688610012BF22 /* Resources */ = {
isa = PBXResourcesBuildPhase;
@@ -717,6 +606,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -738,6 +631,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -759,6 +656,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info-iOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -782,6 +683,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info-iOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -803,6 +708,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/tvOS",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info-tvOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -825,6 +734,10 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/tvOS",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "$(SRCROOT)/SlackKit/Supporting Files/Info-tvOS.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
SlackKit.xcodeproj/project.xcworkspace/xcshareddata/SlackKit.xcscmblueprint
-30
View File
@@ -1,30 +0,0 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "7C8CB4917A87F5E5383E6800524CC50437576509",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"7C8CB4917A87F5E5383E6800524CC50437576509" : 0,
"C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "3B1F9BE5-3D70-4A46-866A-32F712AA4823",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"7C8CB4917A87F5E5383E6800524CC50437576509" : "SlackKit\/",
"C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D" : "SlackKit\/Starscream\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "SlackKit",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "SlackKit.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/pvzig\/SlackRTMKit.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7C8CB4917A87F5E5383E6800524CC50437576509"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/daltoniam\/Starscream.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D"
}
]
}
Starscream
-1
Submodule Starscream deleted from bf0146db26