Skip to content

Re-organisation of Project #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Infinity-James wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Re-organisation of Project #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1040b69
Added git ignore.
Infinity-James May 31, 2015
1e568bd
Re-organised the project.
Infinity-James May 31, 2015
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
20 changes: 20 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Xcode
.DS_Store
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
profile
*.moved-aside
DerivedData
.idea/
# Pods - for those of you who use CocoaPods
Pods
132 changes: 79 additions & 53 deletions FunctionalViewControllers/FunctionalViewControllers.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
objects = {

/* Begin PBXBuildFile section */
8369273C1AB5D5210046DE26 /* FunctionalViewControllers.h in Headers */ = {isa = PBXBuildFile; fileRef = 8369273B1AB5D5210046DE26 /* FunctionalViewControllers.h */; settings = {ATTRIBUTES = (Public, ); }; };
1A00BDA31B1B29BA00F558BB /* FunctionalViewControllers.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A00BDA21B1B29BA00F558BB /* FunctionalViewControllers.h */; settings = {ATTRIBUTES = (Public, ); }; };
1A6AC91C1B1B273000119EBB /* TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6AC9121B1B273000119EBB /* TableView.swift */; };
1A6AC91D1B1B273000119EBB /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6AC9131B1B273000119EBB /* UIViewController+Extensions.swift */; };
1A6AC9201B1B273000119EBB /* APIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6AC9181B1B273000119EBB /* APIClient.swift */; };
1A6AC9211B1B273000119EBB /* Library.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6AC9191B1B273000119EBB /* Library.swift */; };
1A6AC9221B1B273000119EBB /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6AC91A1B1B273000119EBB /* Network.swift */; };
1A6AC9281B1B273F00119EBB /* FunctionalViewControllersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6AC9251B1B273F00119EBB /* FunctionalViewControllersTests.swift */; };
836927421AB5D5210046DE26 /* FunctionalViewControllers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 836927361AB5D5210046DE26 /* FunctionalViewControllers.framework */; };
836927491AB5D5210046DE26 /* FunctionalViewControllersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836927481AB5D5210046DE26 /* FunctionalViewControllersTests.swift */; };
836927611AB5D53F0046DE26 /* Library.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8369275B1AB5D53F0046DE26 /* Library.swift */; };
836927621AB5D53F0046DE26 /* APIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8369275C1AB5D53F0046DE26 /* APIClient.swift */; };
836927631AB5D53F0046DE26 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8369275D1AB5D53F0046DE26 /* Network.swift */; };
836927641AB5D53F0046DE26 /* TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8369275E1AB5D53F0046DE26 /* TableView.swift */; };
836927661AB5D53F0046DE26 /* UIViewController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836927601AB5D53F0046DE26 /* UIViewController+Extensions.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -28,17 +28,17 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
1A00BDA21B1B29BA00F558BB /* FunctionalViewControllers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionalViewControllers.h; sourceTree = "<group>"; };
1A6AC9121B1B273000119EBB /* TableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableView.swift; sourceTree = "<group>"; };
1A6AC9131B1B273000119EBB /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extensions.swift"; sourceTree = "<group>"; };
1A6AC9161B1B273000119EBB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1A6AC9181B1B273000119EBB /* APIClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APIClient.swift; sourceTree = "<group>"; };
1A6AC9191B1B273000119EBB /* Library.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Library.swift; sourceTree = "<group>"; };
1A6AC91A1B1B273000119EBB /* Network.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
1A6AC9251B1B273F00119EBB /* FunctionalViewControllersTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FunctionalViewControllersTests.swift; sourceTree = "<group>"; };
1A6AC9271B1B273F00119EBB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
836927361AB5D5210046DE26 /* FunctionalViewControllers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FunctionalViewControllers.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8369273A1AB5D5210046DE26 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8369273B1AB5D5210046DE26 /* FunctionalViewControllers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FunctionalViewControllers.h; sourceTree = "<group>"; };
836927411AB5D5210046DE26 /* FunctionalViewControllersTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FunctionalViewControllersTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
836927471AB5D5210046DE26 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
836927481AB5D5210046DE26 /* FunctionalViewControllersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FunctionalViewControllersTests.swift; sourceTree = "<group>"; };
8369275B1AB5D53F0046DE26 /* Library.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Library.swift; sourceTree = "<group>"; };
8369275C1AB5D53F0046DE26 /* APIClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APIClient.swift; sourceTree = "<group>"; };
8369275D1AB5D53F0046DE26 /* Network.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
8369275E1AB5D53F0046DE26 /* TableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableView.swift; sourceTree = "<group>"; };
836927601AB5D53F0046DE26 /* UIViewController+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extensions.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -60,61 +60,85 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
8369272C1AB5D5210046DE26 = {
1A6AC90F1B1B273000119EBB /* FunctionalViewControllers */ = {
isa = PBXGroup;
children = (
836927381AB5D5210046DE26 /* FunctionalViewControllers */,
836927451AB5D5210046DE26 /* FunctionalViewControllersTests */,
836927371AB5D5210046DE26 /* Products */,
1A6AC9101B1B273000119EBB /* Controller */,
1A6AC9141B1B273000119EBB /* Supporting-Files */,
1A6AC9171B1B273000119EBB /* Utility */,
);
path = FunctionalViewControllers;
sourceTree = "<group>";
};
836927371AB5D5210046DE26 /* Products */ = {
1A6AC9101B1B273000119EBB /* Controller */ = {
isa = PBXGroup;
children = (
836927361AB5D5210046DE26 /* FunctionalViewControllers.framework */,
836927411AB5D5210046DE26 /* FunctionalViewControllersTests.xctest */,
1A6AC9121B1B273000119EBB /* TableView.swift */,
1A6AC9131B1B273000119EBB /* UIViewController+Extensions.swift */,
);
name = Products;
path = Controller;
sourceTree = "<group>";
};
836927381AB5D5210046DE26 /* FunctionalViewControllers */ = {
1A6AC9141B1B273000119EBB /* Supporting-Files */ = {
isa = PBXGroup;
children = (
8369275B1AB5D53F0046DE26 /* Library.swift */,
8369275C1AB5D53F0046DE26 /* APIClient.swift */,
8369275D1AB5D53F0046DE26 /* Network.swift */,
8369275E1AB5D53F0046DE26 /* TableView.swift */,
836927601AB5D53F0046DE26 /* UIViewController+Extensions.swift */,
8369273B1AB5D5210046DE26 /* FunctionalViewControllers.h */,
836927391AB5D5210046DE26 /* Supporting Files */,
1A00BDA21B1B29BA00F558BB /* FunctionalViewControllers.h */,
1A6AC9161B1B273000119EBB /* Info.plist */,
);
path = FunctionalViewControllers;
path = "Supporting-Files";
sourceTree = "<group>";
};
836927391AB5D5210046DE26 /* Supporting Files */ = {
1A6AC9171B1B273000119EBB /* Utility */ = {
isa = PBXGroup;
children = (
8369273A1AB5D5210046DE26 /* Info.plist */,
1A6AC9181B1B273000119EBB /* APIClient.swift */,
1A6AC9191B1B273000119EBB /* Library.swift */,
1A6AC91A1B1B273000119EBB /* Network.swift */,
);
name = "Supporting Files";
path = Utility;
sourceTree = "<group>";
};
836927451AB5D5210046DE26 /* FunctionalViewControllersTests */ = {
1A6AC9231B1B273F00119EBB /* FunctionalViewControllersTests */ = {
isa = PBXGroup;
children = (
836927481AB5D5210046DE26 /* FunctionalViewControllersTests.swift */,
836927461AB5D5210046DE26 /* Supporting Files */,
1A6AC9241B1B273F00119EBB /* Source */,
1A6AC9261B1B273F00119EBB /* Supporting-Files */,
);
path = FunctionalViewControllersTests;
sourceTree = "<group>";
};
836927461AB5D5210046DE26 /* Supporting Files */ = {
1A6AC9241B1B273F00119EBB /* Source */ = {
isa = PBXGroup;
children = (
836927471AB5D5210046DE26 /* Info.plist */,
1A6AC9251B1B273F00119EBB /* FunctionalViewControllersTests.swift */,
);
name = "Supporting Files";
path = Source;
sourceTree = "<group>";
};
1A6AC9261B1B273F00119EBB /* Supporting-Files */ = {
isa = PBXGroup;
children = (
1A6AC9271B1B273F00119EBB /* Info.plist */,
);
path = "Supporting-Files";
sourceTree = "<group>";
};
8369272C1AB5D5210046DE26 = {
isa = PBXGroup;
children = (
1A6AC90F1B1B273000119EBB /* FunctionalViewControllers */,
1A6AC9231B1B273F00119EBB /* FunctionalViewControllersTests */,
836927371AB5D5210046DE26 /* Products */,
);
sourceTree = "<group>";
};
836927371AB5D5210046DE26 /* Products */ = {
isa = PBXGroup;
children = (
836927361AB5D5210046DE26 /* FunctionalViewControllers.framework */,
836927411AB5D5210046DE26 /* FunctionalViewControllersTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -124,7 +148,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
8369273C1AB5D5210046DE26 /* FunctionalViewControllers.h in Headers */,
1A00BDA31B1B29BA00F558BB /* FunctionalViewControllers.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -224,19 +248,19 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
836927611AB5D53F0046DE26 /* Library.swift in Sources */,
836927641AB5D53F0046DE26 /* TableView.swift in Sources */,
836927621AB5D53F0046DE26 /* APIClient.swift in Sources */,
836927661AB5D53F0046DE26 /* UIViewController+Extensions.swift in Sources */,
836927631AB5D53F0046DE26 /* Network.swift in Sources */,
1A6AC91D1B1B273000119EBB /* UIViewController+Extensions.swift in Sources */,
1A6AC9221B1B273000119EBB /* Network.swift in Sources */,
1A6AC9211B1B273000119EBB /* Library.swift in Sources */,
1A6AC91C1B1B273000119EBB /* TableView.swift in Sources */,
1A6AC9201B1B273000119EBB /* APIClient.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
8369273D1AB5D5210046DE26 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
836927491AB5D5210046DE26 /* FunctionalViewControllersTests.swift in Sources */,
1A6AC9281B1B273F00119EBB /* FunctionalViewControllersTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -347,7 +371,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = FunctionalViewControllers/Info.plist;
INFOPLIST_FILE = "$(SRCROOT)/FunctionalViewControllers/Supporting-Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -362,7 +386,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = FunctionalViewControllers/Info.plist;
INFOPLIST_FILE = "$(SRCROOT)/FunctionalViewControllers/Supporting-Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -381,7 +405,7 @@
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = FunctionalViewControllersTests/Info.plist;
INFOPLIST_FILE = "FunctionalViewControllersTests/Supporting-Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -394,7 +418,7 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = FunctionalViewControllersTests/Info.plist;
INFOPLIST_FILE = "FunctionalViewControllersTests/Supporting-Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -419,6 +443,7 @@
8369274E1AB5D5210046DE26 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8369274F1AB5D5210046DE26 /* Build configuration list for PBXNativeTarget "FunctionalViewControllersTests" */ = {
isa = XCConfigurationList;
Expand All @@ -427,6 +452,7 @@
836927511AB5D5210046DE26 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
Binary file added FunctionalViewControllers/FunctionalViewControllers/.DS_Store
View file
Open in desktop
Binary file not shown.
0 ...FunctionalViewControllers/TableView.swift → ...iewControllers/Controller/TableView.swift
View file
Open in desktop
File renamed without changes.
0 ...rollers/UIViewController+Extensions.swift → ...troller/UIViewController+Extensions.swift
View file
Open in desktop
File renamed without changes.
0 ...ewControllers/FunctionalViewControllers.h → ...porting-Files/FunctionalViewControllers.h
View file
Open in desktop
File renamed without changes.
0 ...lers/FunctionalViewControllers/Info.plist → ...ewControllers/Supporting-Files/Info.plist
View file
Open in desktop
File renamed without changes.
0 ...FunctionalViewControllers/APIClient.swift → ...alViewControllers/Utility/APIClient.swift
View file
Open in desktop
File renamed without changes.
0 ...s/FunctionalViewControllers/Library.swift → ...onalViewControllers/Utility/Library.swift
View file
Open in desktop
File renamed without changes.
0 ...s/FunctionalViewControllers/Network.swift → ...onalViewControllers/Utility/Network.swift
View file
Open in desktop
File renamed without changes.
Binary file added FunctionalViewControllers/FunctionalViewControllersTests/.DS_Store
View file
Open in desktop
Binary file not shown.
0 ...ests/FunctionalViewControllersTests.swift → ...urce/FunctionalViewControllersTests.swift
View file
Open in desktop
File renamed without changes.
0 ...FunctionalViewControllersTests/Info.plist → ...trollersTests/Supporting-Files/Info.plist
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions GithubIssues.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
835D39961AA1ABFD003FFAF0 /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 835D39951AA1ABFD003FFAF0 /* Storyboard.storyboard */; };
835D39A21AA1B2DA003FFAF0 /* Credentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = 835D39A11AA1B2DA003FFAF0 /* Credentials.swift */; };
835D39A61AA1B458003FFAF0 /* GithubAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 835D39A51AA1B458003FFAF0 /* GithubAPI.swift */; };
836927681AB5D54C0046DE26 /* FunctionalViewControllers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 836927671AB5D54C0046DE26 /* FunctionalViewControllers.framework */; };
837D190A1AAB8D5A008F71C6 /* Resources.swift in Sources */ = {isa = PBXBuildFile; fileRef = 837D19091AAB8D5A008F71C6 /* Resources.swift */; };
837D190E1AAC56AE008F71C6 /* IssueEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 837D190D1AAC56AE008F71C6 /* IssueEditViewController.swift */; };
/* End PBXBuildFile section */
Expand All @@ -41,7 +40,6 @@
835D39951AA1ABFD003FFAF0 /* Storyboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Storyboard.storyboard; sourceTree = "<group>"; };
835D39A11AA1B2DA003FFAF0 /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = "<group>"; };
835D39A51AA1B458003FFAF0 /* GithubAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GithubAPI.swift; sourceTree = "<group>"; };
836927671AB5D54C0046DE26 /* FunctionalViewControllers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FunctionalViewControllers.framework; path = "FunctionalViewControllers/build/Debug-iphoneos/FunctionalViewControllers.framework"; sourceTree = "<group>"; };
837D19091AAB8D5A008F71C6 /* Resources.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Resources.swift; sourceTree = "<group>"; };
837D190D1AAC56AE008F71C6 /* IssueEditViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssueEditViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -51,7 +49,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
836927681AB5D54C0046DE26 /* FunctionalViewControllers.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -68,7 +65,6 @@
835D39631AA1AA92003FFAF0 = {
isa = PBXGroup;
children = (
836927671AB5D54C0046DE26 /* FunctionalViewControllers.framework */,
835D396E1AA1AA92003FFAF0 /* GithubIssues */,
835D39841AA1AA92003FFAF0 /* GithubIssuesTests */,
835D396D1AA1AA92003FFAF0 /* Products */,
Expand Down