Skip to content

Commit 1035790

Browse files
matthijseikelenboommatthijseikelenboom
committed
Rearranged files in the Git folder
1 parent 2badba4 commit 1035790

File tree

2 files changed

+47
-51
lines changed

2 files changed

+47
-51
lines changed

‎CodeEdit.xcodeproj/project.pbxproj

Lines changed: 39 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@
461461
B67DB0F92AFDF638002DC647 /* IconButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B67DB0F82AFDF638002DC647 /* IconButtonStyle.swift */; };
462462
B67DB0FC2AFDF71F002DC647 /* IconToggleStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B67DB0FB2AFDF71F002DC647 /* IconToggleStyle.swift */; };
463463
B685DE7929CC9CCD002860C8 /* StatusBarIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = B685DE7829CC9CCD002860C8 /* StatusBarIcon.swift */; };
464-
B68C7C212A01DEFE004EA6D6 /* GitHubComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = B68C7C202A01DEFE004EA6D6 /* GitHubComment.swift */; };
465464
B697937A29FF5668002027EC /* AccountsSettingsAccountLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */; };
466465
B69BFDC72B0686910050D9A6 /* GitClient+Initiate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */; };
467466
B6A43C5D29FC4AF00027E0E0 /* CreateSSHKeyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6A43C5C29FC4AF00027E0E0 /* CreateSSHKeyView.swift */; };
@@ -1022,7 +1021,6 @@
10221021
B67DB0F82AFDF638002DC647 /* IconButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconButtonStyle.swift; sourceTree = "<group>"; };
10231022
B67DB0FB2AFDF71F002DC647 /* IconToggleStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconToggleStyle.swift; sourceTree = "<group>"; };
10241023
B685DE7829CC9CCD002860C8 /* StatusBarIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBarIcon.swift; sourceTree = "<group>"; };
1025-
B68C7C202A01DEFE004EA6D6 /* GitHubComment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitHubComment.swift; sourceTree = "<group>"; };
10261024
B697937929FF5668002027EC /* AccountsSettingsAccountLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsSettingsAccountLink.swift; sourceTree = "<group>"; };
10271025
B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Initiate.swift"; sourceTree = "<group>"; };
10281026
B6A43C5C29FC4AF00027E0E0 /* CreateSSHKeyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSSHKeyView.swift; sourceTree = "<group>"; };
@@ -1828,8 +1826,8 @@
18281826
isa = PBXGroup;
18291827
children = (
18301828
04BA7C102AE2AA7300584E1C /* ViewModels */,
1831-
587B9E0729301D8F00AC7927 /* GitCloneView.swift */,
18321829
587B9E0829301D8F00AC7927 /* GitCheckoutBranchView.swift */,
1830+
587B9E0729301D8F00AC7927 /* GitCloneView.swift */,
18331831
);
18341832
path = Clone;
18351833
sourceTree = "<group>";
@@ -1852,39 +1850,39 @@
18521850
children = (
18531851
587B9E1429301D8F00AC7927 /* Model */,
18541852
587B9E0C29301D8F00AC7927 /* Routers */,
1855-
587B9E1129301D8F00AC7927 /* GitLabOAuthConfiguration.swift */,
1856-
587B9E1229301D8F00AC7927 /* GitLabConfiguration.swift */,
18571853
587B9E1329301D8F00AC7927 /* GitLabAccount.swift */,
1854+
587B9E1229301D8F00AC7927 /* GitLabConfiguration.swift */,
1855+
587B9E1129301D8F00AC7927 /* GitLabOAuthConfiguration.swift */,
18581856
);
18591857
path = GitLab;
18601858
sourceTree = "<group>";
18611859
};
18621860
587B9E0C29301D8F00AC7927 /* Routers */ = {
18631861
isa = PBXGroup;
18641862
children = (
1865-
587B9E0D29301D8F00AC7927 /* GitLabUserRouter.swift */,
18661863
587B9E0E29301D8F00AC7927 /* GitLabCommitRouter.swift */,
1867-
587B9E0F29301D8F00AC7927 /* GitLabProjectRouter.swift */,
18681864
587B9E1029301D8F00AC7927 /* GitLabOAuthRouter.swift */,
1865+
587B9E0F29301D8F00AC7927 /* GitLabProjectRouter.swift */,
1866+
587B9E0D29301D8F00AC7927 /* GitLabUserRouter.swift */,
18691867
);
18701868
path = Routers;
18711869
sourceTree = "<group>";
18721870
};
18731871
587B9E1429301D8F00AC7927 /* Model */ = {
18741872
isa = PBXGroup;
18751873
children = (
1876-
587B9E1529301D8F00AC7927 /* GitLabCommit.swift */,
1877-
587B9E1629301D8F00AC7927 /* GitLabGroupAccess.swift */,
1878-
587B9E1729301D8F00AC7927 /* GitLabProjectHook.swift */,
1879-
587B9E1829301D8F00AC7927 /* GitLabEventData.swift */,
18801874
587B9E1929301D8F00AC7927 /* GitLabAccountModel.swift */,
1881-
587B9E1A29301D8F00AC7927 /* GitLabEvent.swift */,
1882-
587B9E1B29301D8F00AC7927 /* GitLabPermissions.swift */,
18831875
587B9E1C29301D8F00AC7927 /* GitLabAvatarURL.swift */,
1884-
587B9E1D29301D8F00AC7927 /* GitLabNamespace.swift */,
1876+
587B9E1529301D8F00AC7927 /* GitLabCommit.swift */,
1877+
587B9E1A29301D8F00AC7927 /* GitLabEvent.swift */,
1878+
587B9E1829301D8F00AC7927 /* GitLabEventData.swift */,
18851879
587B9E1E29301D8F00AC7927 /* GitLabEventNote.swift */,
1880+
587B9E1629301D8F00AC7927 /* GitLabGroupAccess.swift */,
1881+
587B9E1D29301D8F00AC7927 /* GitLabNamespace.swift */,
1882+
587B9E1B29301D8F00AC7927 /* GitLabPermissions.swift */,
18861883
587B9E1F29301D8F00AC7927 /* GitLabProject.swift */,
18871884
587B9E2029301D8F00AC7927 /* GitLabProjectAccess.swift */,
1885+
587B9E1729301D8F00AC7927 /* GitLabProjectHook.swift */,
18881886
587B9E2129301D8F00AC7927 /* GitLabUser.swift */,
18891887
);
18901888
path = Model;
@@ -1893,20 +1891,20 @@
18931891
587B9E2229301D8F00AC7927 /* Networking */ = {
18941892
isa = PBXGroup;
18951893
children = (
1896-
587B9E2329301D8F00AC7927 /* GitURLSession.swift */,
18971894
587B9E2429301D8F00AC7927 /* GitJSONPostRouter.swift */,
18981895
587B9E2529301D8F00AC7927 /* GitRouter.swift */,
1896+
587B9E2329301D8F00AC7927 /* GitURLSession.swift */,
18991897
);
19001898
path = Networking;
19011899
sourceTree = "<group>";
19021900
};
19031901
587B9E2629301D8F00AC7927 /* Utils */ = {
19041902
isa = PBXGroup;
19051903
children = (
1906-
587B9E2729301D8F00AC7927 /* URL+URLParameters.swift */,
1907-
587B9E2829301D8F00AC7927 /* String+QueryParameters.swift */,
19081904
587B9E2929301D8F00AC7927 /* GitTime.swift */,
19091905
587B9E2A29301D8F00AC7927 /* String+PercentEncoding.swift */,
1906+
587B9E2829301D8F00AC7927 /* String+QueryParameters.swift */,
1907+
587B9E2729301D8F00AC7927 /* URL+URLParameters.swift */,
19101908
);
19111909
path = Utils;
19121910
sourceTree = "<group>";
@@ -1916,24 +1914,24 @@
19161914
children = (
19171915
587B9E3829301D8F00AC7927 /* Model */,
19181916
587B9E2D29301D8F00AC7927 /* Routers */,
1917+
587B9E4329301D8F00AC7927 /* GitHubAccount.swift */,
19191918
587B9E3529301D8F00AC7927 /* GitHubConfiguration.swift */,
1920-
587B9E3629301D8F00AC7927 /* PublicKey.swift */,
1921-
587B9E3729301D8F00AC7927 /* GitHubPreviewHeader.swift */,
19221919
587B9E4229301D8F00AC7927 /* GitHubOpenness.swift */,
1923-
587B9E4329301D8F00AC7927 /* GitHubAccount.swift */,
1920+
587B9E3729301D8F00AC7927 /* GitHubPreviewHeader.swift */,
1921+
587B9E3629301D8F00AC7927 /* PublicKey.swift */,
19241922
);
19251923
path = GitHub;
19261924
sourceTree = "<group>";
19271925
};
19281926
587B9E2D29301D8F00AC7927 /* Routers */ = {
19291927
isa = PBXGroup;
19301928
children = (
1929+
587B9E3329301D8F00AC7927 /* GitHubGistRouter.swift */,
19311930
587B9E2E29301D8F00AC7927 /* GitHubIssueRouter.swift */,
1931+
587B9E3229301D8F00AC7927 /* GitHubPullRequestRouter.swift */,
1932+
587B9E3129301D8F00AC7927 /* GitHubRepositoryRouter.swift */,
19321933
587B9E2F29301D8F00AC7927 /* GitHubReviewsRouter.swift */,
19331934
587B9E3029301D8F00AC7927 /* GitHubRouter.swift */,
1934-
587B9E3129301D8F00AC7927 /* GitHubRepositoryRouter.swift */,
1935-
587B9E3229301D8F00AC7927 /* GitHubPullRequestRouter.swift */,
1936-
587B9E3329301D8F00AC7927 /* GitHubGistRouter.swift */,
19371935
587B9E3429301D8F00AC7927 /* GitHubUserRouter.swift */,
19381936
);
19391937
path = Routers;
@@ -1942,16 +1940,15 @@
19421940
587B9E3829301D8F00AC7927 /* Model */ = {
19431941
isa = PBXGroup;
19441942
children = (
1945-
587B9E3929301D8F00AC7927 /* GitHubPullRequest.swift */,
1946-
587B9E3A29301D8F00AC7927 /* GitHubUser.swift */,
1947-
587B9E3B29301D8F00AC7927 /* GitHubReview.swift */,
1943+
587B9E4129301D8F00AC7927 /* GitHubAccount+deleteReference.swift */,
19481944
587B9E3C29301D8F00AC7927 /* GitHubComment.swift */,
1949-
587B9E3D29301D8F00AC7927 /* GitHubRepositories.swift */,
19501945
587B9E3E29301D8F00AC7927 /* GitHubFiles.swift */,
19511946
587B9E3F29301D8F00AC7927 /* GitHubGist.swift */,
19521947
587B9E4029301D8F00AC7927 /* GitHubIssue.swift */,
1953-
587B9E4129301D8F00AC7927 /* GitHubAccount+deleteReference.swift */,
1954-
B68C7C202A01DEFE004EA6D6 /* GitHubComment.swift */,
1948+
587B9E3929301D8F00AC7927 /* GitHubPullRequest.swift */,
1949+
587B9E3D29301D8F00AC7927 /* GitHubRepositories.swift */,
1950+
587B9E3B29301D8F00AC7927 /* GitHubReview.swift */,
1951+
587B9E3A29301D8F00AC7927 /* GitHubUser.swift */,
19551952
);
19561953
path = Model;
19571954
sourceTree = "<group>";
@@ -1962,29 +1959,29 @@
19621959
587B9E4D29301D8F00AC7927 /* Model */,
19631960
587B9E4529301D8F00AC7927 /* Routers */,
19641961
587B9E4A29301D8F00AC7927 /* BitBucketAccount.swift */,
1962+
587B9E5029301D8F00AC7927 /* BitBucketAccount+Token.swift */,
19651963
587B9E4B29301D8F00AC7927 /* BitBucketOAuthConfiguration.swift */,
19661964
587B9E4C29301D8F00AC7927 /* BitBucketTokenConfiguration.swift */,
1967-
587B9E5029301D8F00AC7927 /* BitBucketAccount+Token.swift */,
19681965
);
19691966
path = Bitbucket;
19701967
sourceTree = "<group>";
19711968
};
19721969
587B9E4529301D8F00AC7927 /* Routers */ = {
19731970
isa = PBXGroup;
19741971
children = (
1972+
587B9E4929301D8F00AC7927 /* BitBucketOAuthRouter.swift */,
19751973
587B9E4629301D8F00AC7927 /* BitBucketRepositoryRouter.swift */,
1976-
587B9E4729301D8F00AC7927 /* BitBucketUserRouter.swift */,
19771974
587B9E4829301D8F00AC7927 /* BitBucketTokenRouter.swift */,
1978-
587B9E4929301D8F00AC7927 /* BitBucketOAuthRouter.swift */,
1975+
587B9E4729301D8F00AC7927 /* BitBucketUserRouter.swift */,
19791976
);
19801977
path = Routers;
19811978
sourceTree = "<group>";
19821979
};
19831980
587B9E4D29301D8F00AC7927 /* Model */ = {
19841981
isa = PBXGroup;
19851982
children = (
1986-
587B9E4E29301D8F00AC7927 /* BitBucketUser.swift */,
19871983
587B9E4F29301D8F00AC7927 /* BitBucketRepositories.swift */,
1984+
587B9E4E29301D8F00AC7927 /* BitBucketUser.swift */,
19881985
);
19891986
path = Model;
19901987
sourceTree = "<group>";
@@ -1995,16 +1992,16 @@
19951992
587B9E5229301D8F00AC7927 /* Models */,
19961993
58A5DF7F29325B5A00D1BD5D /* GitClient.swift */,
19971994
04BA7C182AE2D7C600584E1C /* GitClient+Branches.swift */,
1998-
04BA7C1B2AE2D84100584E1C /* GitClient+Commit.swift */,
19991995
04BA7C1D2AE2D8A000584E1C /* GitClient+Clone.swift */,
2000-
B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */,
2001-
04BA7C1F2AE2D92B00584E1C /* GitClient+Status.swift */,
1996+
04BA7C1B2AE2D84100584E1C /* GitClient+Commit.swift */,
20021997
04BA7C212AE2D95E00584E1C /* GitClient+CommitHistory.swift */,
1998+
B65B11032B09DB1C002852CF /* GitClient+Fetch.swift */,
1999+
B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */,
2000+
B65B10EE2B07C454002852CF /* GitClient+Remote.swift */,
20032001
B65B11002B09D5D4002852CF /* GitClient+Pull.swift */,
20042002
04BA7C262AE2E9F100584E1C /* GitClient+Push.swift */,
2005-
B65B10EE2B07C454002852CF /* GitClient+Remote.swift */,
2006-
B65B11032B09DB1C002852CF /* GitClient+Fetch.swift */,
20072003
B607181C2B0C5BE3009CDAB4 /* GitClient+Stash.swift */,
2004+
04BA7C1F2AE2D92B00584E1C /* GitClient+Status.swift */,
20082005
B628B7922B18369800F9775A /* GitClient+Validate.swift */,
20092006
);
20102007
path = Client;
@@ -2013,13 +2010,13 @@
20132010
587B9E5229301D8F00AC7927 /* Models */ = {
20142011
isa = PBXGroup;
20152012
children = (
2016-
587B9E5329301D8F00AC7927 /* GitCommit.swift */,
2017-
587B9E5429301D8F00AC7927 /* GitChangedFile.swift */,
2018-
587B9E5529301D8F00AC7927 /* GitType.swift */,
20192013
04BA7C0A2AE2A2D100584E1C /* GitBranch.swift */,
2014+
9D36E1BE2B5E7D7500443C41 /* GitBranchesGroup.swift */,
2015+
587B9E5429301D8F00AC7927 /* GitChangedFile.swift */,
2016+
587B9E5329301D8F00AC7927 /* GitCommit.swift */,
20202017
B65B10F12B07D34F002852CF /* GitRemote.swift */,
20212018
B607181F2B0C6CE7009CDAB4 /* GitStashEntry.swift */,
2022-
9D36E1BE2B5E7D7500443C41 /* GitBranchesGroup.swift */,
2019+
587B9E5529301D8F00AC7927 /* GitType.swift */,
20232020
);
20242021
path = Models;
20252022
sourceTree = "<group>";
@@ -3653,7 +3650,6 @@
36533650
B6A43C5D29FC4AF00027E0E0 /* CreateSSHKeyView.swift in Sources */,
36543651
B6EA200229DB7F81001BF195 /* View+ConstrainHeightToWindow.swift in Sources */,
36553652
66F370342BEE537B00D3B823 /* NonTextFileView.swift in Sources */,
3656-
B68C7C212A01DEFE004EA6D6 /* GitHubComment.swift in Sources */,
36573653
613899B72B6E702F00A5CAF6 /* String+LengthOfMatchingPrefix.swift in Sources */,
36583654
6C48D8F42972DB1A00D6D205 /* Env+Window.swift in Sources */,
36593655
6C5FDF7A29E6160000BC08C0 /* AppSettings.swift in Sources */,

‎CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
"kind" : "remoteSourceControl",
2525
"location" : "https://github.com/CodeEditApp/CodeEditLanguages.git",
2626
"state" : {
27-
"revision" : "620b463c88894741e20d4711c9435b33547de5d2",
28-
"version" : "0.1.18"
27+
"revision" : "5b27f139269e1ea49ceae5e56dca44a3ccad50a1",
28+
"version" : "0.1.19"
2929
}
3030
},
3131
{
3232
"identity" : "codeeditsourceeditor",
3333
"kind" : "remoteSourceControl",
3434
"location" : "https://github.com/CodeEditApp/CodeEditSourceEditor",
3535
"state" : {
36-
"revision" : "7360f00bf7ec8e93b4833357bd254bef7e5c943d",
37-
"version" : "0.7.2"
36+
"revision" : "cf85789d527d569e94edfd674c5ac8071b244dd9",
37+
"version" : "0.7.3"
3838
}
3939
},
4040
{
@@ -51,8 +51,8 @@
5151
"kind" : "remoteSourceControl",
5252
"location" : "https://github.com/CodeEditApp/CodeEditTextView.git",
5353
"state" : {
54-
"revision" : "86b980464bcb67693e2053283c7a99bdc6f358bc",
55-
"version" : "0.7.3"
54+
"revision" : "80911be6bcdae5e35ef5ed351adf6dda9b57e555",
55+
"version" : "0.7.4"
5656
}
5757
},
5858
{
@@ -150,8 +150,8 @@
150150
"kind" : "remoteSourceControl",
151151
"location" : "https://github.com/lukepistrol/SwiftLintPlugin",
152152
"state" : {
153-
"revision" : "ea6d3ca895b49910f790e98e4b4ca658e0fe490e",
154-
"version" : "0.54.0"
153+
"revision" : "a0f7b12c7be228592d924f29f654ebbd924ac9c5",
154+
"version" : "0.55.1"
155155
}
156156
},
157157
{

0 commit comments

Comments
 (0)