Skip to content

Commit e307e0d

Browse files
Merge branch 'main' into itembox
2 parents 92f1216 + e955486 commit e307e0d

File tree

104 files changed

+5593
-812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+5593
-812
lines changed

.github/workflows/CI-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CI - Pull Request
22
on:
33
pull_request:
4-
branches:
4+
branches:
55
- 'main'
66
workflow_dispatch:
77
jobs:

.github/workflows/build-documentation.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ jobs:
1414
run: |
1515
cd docs
1616
git init
17+
git config http.postBuffer 524288000
1718
git add -A
1819
git config --local user.email "action@github.com"
1920
git config --local user.name "GitHub Action"
2021
git commit -m 'deploy'
2122
2223
- name: Force push to destination branch
23-
uses: ad-m/github-push-action@v0.6.0
24+
uses: ad-m/github-push-action@v0.8.0
2425
with:
2526
github_token: ${{ secrets.GITHUB_TOKEN }}
2627
branch: docs

.github/workflows/swiftlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
steps:
99
- uses: actions/checkout@v3
1010
- name: GitHub Action for SwiftLint with --strict
11-
run: swiftlint --strict
11+
run: swiftlint --reporter github-actions-logging --strict

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.pbxproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
1CB30C3A2DAA1C28008058A7 /* IndentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CB30C392DAA1C28008058A7 /* IndentPicker.swift */; };
1011
61621C612C74FB2200494A4A /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61621C602C74FB2200494A4A /* CodeEditSourceEditor */; };
12+
61CE772F2D19BF7D00908C57 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */; };
13+
61CE77322D19BFAA00908C57 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */; };
1114
6C13652E2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13652D2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift */; };
1215
6C1365302B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13652F2B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift */; };
1316
6C1365322B8A7B94004A1D18 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365312B8A7B94004A1D18 /* ContentView.swift */; };
@@ -17,9 +20,11 @@
1720
6C1365462B8A7F2D004A1D18 /* LanguagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */; };
1821
6C1365482B8A7FBF004A1D18 /* EditorTheme+Default.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C1365472B8A7FBF004A1D18 /* EditorTheme+Default.swift */; };
1922
6C13654D2B8A821E004A1D18 /* NSColor+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C13654C2B8A821E004A1D18 /* NSColor+Hex.swift */; };
23+
6CF31D4E2DB6A252006A77FD /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CF31D4D2DB6A252006A77FD /* StatusBar.swift */; };
2024
/* End PBXBuildFile section */
2125

2226
/* Begin PBXFileReference section */
27+
1CB30C392DAA1C28008058A7 /* IndentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndentPicker.swift; sourceTree = "<group>"; };
2328
6C13652A2B8A7B94004A1D18 /* CodeEditSourceEditorExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CodeEditSourceEditorExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
2429
6C13652D2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditSourceEditorExampleApp.swift; sourceTree = "<group>"; };
2530
6C13652F2B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeEditSourceEditorExampleDocument.swift; sourceTree = "<group>"; };
@@ -33,6 +38,7 @@
3338
6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguagePicker.swift; sourceTree = "<group>"; };
3439
6C1365472B8A7FBF004A1D18 /* EditorTheme+Default.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EditorTheme+Default.swift"; sourceTree = "<group>"; };
3540
6C13654C2B8A821E004A1D18 /* NSColor+Hex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSColor+Hex.swift"; sourceTree = "<group>"; };
41+
6CF31D4D2DB6A252006A77FD /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
3642
/* End PBXFileReference section */
3743

3844
/* Begin PBXFrameworksBuildPhase section */
@@ -41,6 +47,8 @@
4147
buildActionMask = 2147483647;
4248
files = (
4349
61621C612C74FB2200494A4A /* CodeEditSourceEditor in Frameworks */,
50+
61CE772F2D19BF7D00908C57 /* CodeEditSourceEditor in Frameworks */,
51+
61CE77322D19BFAA00908C57 /* CodeEditSourceEditor in Frameworks */,
4452
);
4553
runOnlyForDeploymentPostprocessing = 0;
4654
};
@@ -109,7 +117,9 @@
109117
isa = PBXGroup;
110118
children = (
111119
6C1365312B8A7B94004A1D18 /* ContentView.swift */,
120+
6CF31D4D2DB6A252006A77FD /* StatusBar.swift */,
112121
6C1365452B8A7F2D004A1D18 /* LanguagePicker.swift */,
122+
1CB30C392DAA1C28008058A7 /* IndentPicker.swift */,
113123
);
114124
path = Views;
115125
sourceTree = "<group>";
@@ -140,6 +150,8 @@
140150
name = CodeEditSourceEditorExample;
141151
packageProductDependencies = (
142152
61621C602C74FB2200494A4A /* CodeEditSourceEditor */,
153+
61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */,
154+
61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */,
143155
);
144156
productName = CodeEditSourceEditorExample;
145157
productReference = 6C13652A2B8A7B94004A1D18 /* CodeEditSourceEditorExample.app */;
@@ -200,8 +212,10 @@
200212
6C1365482B8A7FBF004A1D18 /* EditorTheme+Default.swift in Sources */,
201213
6C13654D2B8A821E004A1D18 /* NSColor+Hex.swift in Sources */,
202214
6C1365302B8A7B94004A1D18 /* CodeEditSourceEditorExampleDocument.swift in Sources */,
215+
6CF31D4E2DB6A252006A77FD /* StatusBar.swift in Sources */,
203216
6C13652E2B8A7B94004A1D18 /* CodeEditSourceEditorExampleApp.swift in Sources */,
204217
6C1365442B8A7EED004A1D18 /* String+Lines.swift in Sources */,
218+
1CB30C3A2DAA1C28008058A7 /* IndentPicker.swift in Sources */,
205219
6C1365322B8A7B94004A1D18 /* ContentView.swift in Sources */,
206220
6C1365462B8A7F2D004A1D18 /* LanguagePicker.swift in Sources */,
207221
);
@@ -412,6 +426,14 @@
412426
isa = XCSwiftPackageProductDependency;
413427
productName = CodeEditSourceEditor;
414428
};
429+
61CE772E2D19BF7D00908C57 /* CodeEditSourceEditor */ = {
430+
isa = XCSwiftPackageProductDependency;
431+
productName = CodeEditSourceEditor;
432+
};
433+
61CE77312D19BFAA00908C57 /* CodeEditSourceEditor */ = {
434+
isa = XCSwiftPackageProductDependency;
435+
productName = CodeEditSourceEditor;
436+
};
415437
/* End XCSwiftPackageProductDependency section */
416438
};
417439
rootObject = 6C1365222B8A7B94004A1D18 /* Project object */;

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 38 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)