Skip to content

Commit f01ab53

Browse files
Revert "- Update Nodes to use triple slash comments rather than block based comments (this matches Xcode’s documentation style using Editor -> Structure -> Add Documentation)"
This reverts commit 4b8b297.
1 parent 4f86111 commit f01ab53

File tree

1,268 files changed

+72680
-1865
lines changed

Some content is hidden

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

1,268 files changed

+72680
-1865
lines changed

.github/workflows/artifactory.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
tags: ['[0-9]+.[0-9]+.[0-9]+']
66

77
env:
8-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
8+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
99

1010
jobs:
1111
artifactory:
@@ -18,14 +18,15 @@ jobs:
1818
- name: Install dependencies
1919
run: brew install jfrog-cli
2020
- name: Checkout source
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v3
2222
- name: Build documentation
2323
run: |
2424
make docs open="no" DERIVED_DATA_PATH="$(mktemp -d)"
2525
mkdir Documentation
2626
mv .build/documentation/archive/Nodes.doccarchive Documentation
2727
- name: Archive
28-
run: tar -czf "Nodes-${GITHUB_REF_NAME}.tar.gz" Sources Documentation
28+
run: >
29+
tar -czf "Nodes-${GITHUB_REF_NAME}.tar.gz" Sources Documentation
2930
- name: Upload
3031
run: >
3132
jf rt u

.github/workflows/docc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
branches: [ main ]
88

99
env:
10-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
10+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
1111

1212
jobs:
1313
docc:
1414
name: DocC
1515
runs-on: macos-latest
1616
steps:
1717
- name: Checkout source
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v3
1919
- name: Build
2020
run: make docs open="no" DERIVED_DATA_PATH="$(mktemp -d)"

.github/workflows/genesis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [ main ]
88

99
env:
10-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
10+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
1111

1212
jobs:
1313
genesis:
@@ -21,7 +21,7 @@ jobs:
2121
brew install mint xcodegen needle mockolo
2222
mint install yonaskolb/genesis
2323
- name: Checkout source
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v3
2525
- name: Create temporary directory
2626
id: mktemp
2727
run: echo "directory=$(mktemp -d)" >> "$GITHUB_OUTPUT"
@@ -41,8 +41,9 @@ jobs:
4141
run: swift package resolve
4242
- name: Lint
4343
working-directory: ${{ steps.mktemp.outputs.directory }}
44-
run: >
45-
"$(find ".build/artifacts/swiftlint" -type f -name swiftlint -perm +111 -print -quit)"
44+
run: |
45+
DIRECTORY_NAME=$(echo "${PWD##*/}" | tr '[:upper:]' '[:lower:]')
46+
"$(find ".build/artifacts/${DIRECTORY_NAME}" -type f -name swiftlint -perm +111 -print -quit)" \
4647
lint --strict --reporter github-actions-logging
4748
- name: Resolve package dependencies
4849
working-directory: ${{ steps.mktemp.outputs.directory }}
@@ -54,7 +55,7 @@ jobs:
5455
build-for-testing
5556
-scheme "Tinder"
5657
-destination "name=$SIMULATOR,OS=latest"
57-
-skipPackagePluginValidation
58+
SWIFT_TREAT_WARNINGS_AS_ERRORS=YES
5859
- name: Test
5960
working-directory: ${{ steps.mktemp.outputs.directory }}
6061
run: >

.github/workflows/lint.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@ on:
77
branches: [ main ]
88

99
env:
10-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
10+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
1111

1212
jobs:
1313
lint:
1414
name: Lint
1515
runs-on: macos-latest
1616
steps:
1717
- name: Checkout source
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v3
1919
- name: Download swiftlint binary
2020
run: swift package resolve
2121
- name: Lint
22-
run: >
23-
"$(find ".build/artifacts/swiftlint" -type f -name swiftlint -perm +111 -print -quit)"
22+
run: |
23+
DIRECTORY_NAME=$(echo "${PWD##*/}" | tr '[:upper:]' '[:lower:]')
24+
"$(find ".build/artifacts/${DIRECTORY_NAME}" -type f -name swiftlint -perm +111 -print -quit)" \
2425
lint --strict --reporter github-actions-logging

.github/workflows/pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
tags: ['[0-9]+.[0-9]+.[0-9]+']
66

77
env:
8-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
8+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
99

1010
jobs:
1111
pages:
@@ -23,7 +23,7 @@ jobs:
2323
url: ${{ steps.deployment.outputs.page_url }}
2424
steps:
2525
- name: Checkout source
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v3
2727
- name: Configure pages
2828
uses: actions/configure-pages@v2
2929
- name: Build documentation

.github/workflows/swift.yml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,39 @@ on:
77
branches: [ main ]
88

99
env:
10-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
10+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
11+
SWIFT_STRICT_CONCURRENCY: complete
1112

1213
jobs:
1314
swift:
1415
name: Swift
1516
runs-on: macos-latest
1617
steps:
1718
- name: Checkout source
18-
uses: actions/checkout@v4
19+
uses: actions/checkout@v3
20+
- name: Validate excluded snapshots
21+
run: |
22+
SNAPSHOTS=$(find Tests -type d -name "__Snapshots__" | sort)
23+
EXCLUDED=$(swift package dump-package | jq -r '.targets[] | select(.type == "test") | "Tests/" + .name + "/" + .exclude[]' | sort)
24+
UNEXCLUDED=$(comm -23 <(echo "$SNAPSHOTS") <(echo "$EXCLUDED"))
25+
if test -n "$UNEXCLUDED"
26+
then
27+
echo "::error::Snapshot directories must be excluded from Swift package:" >&2
28+
echo "$UNEXCLUDED" >&2
29+
exit 1
30+
fi
1931
- name: Build
20-
run: swift build -v
32+
run: swift build -v -Xswiftc -warnings-as-errors
2133
- name: Test
2234
run: swift test -v
35+
- name: Delete snapshots
36+
run: make delete-snapshots
37+
- name: Record snapshots
38+
run: swift test -v
39+
continue-on-error: true
40+
- name: Validate recorded snapshots
41+
run: test -z "$(git status --porcelain)"
42+
- name: Validate executables
43+
run: |
44+
swift run -- nodes-code-gen --help
45+
swift run -- nodes-xcode-templates-gen --help

.github/workflows/xcode.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [ main ]
88

99
env:
10-
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
10+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
1111

1212
jobs:
1313
xcode:
@@ -17,7 +17,7 @@ jobs:
1717
SIMULATOR: iPhone 14
1818
steps:
1919
- name: Checkout source
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v3
2121
- name: Resolve package dependencies
2222
run: xcodebuild -resolvePackageDependencies
2323
- name: Build
@@ -26,7 +26,7 @@ jobs:
2626
build-for-testing
2727
-scheme "Nodes-Package"
2828
-destination "name=$SIMULATOR,OS=latest"
29-
-skipPackagePluginValidation
29+
SWIFT_TREAT_WARNINGS_AS_ERRORS=YES
3030
- name: Test
3131
run: >
3232
xcodebuild

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,9 @@
88
# Xcode
99
*.xcworkspace/
1010
*.xcodeproj/
11+
12+
# Codegen
13+
**/Generated/
14+
15+
# Bazel
16+
bazel-*

.swiftlint-rules.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ only_rules:
3333
- contains_over_filter_is_empty
3434
- contains_over_first_not_nil
3535
- contains_over_range_nil_comparison
36-
# - contrasted_opening_brace
3736
- control_statement
3837
- convenience_type
3938
- custom_rules
@@ -74,7 +73,6 @@ only_rules:
7473
- file_name
7574
- file_name_no_space
7675
- file_types_order
77-
- final_test_case
7876
- first_where
7977
- flatmap_over_map_reduce
8078
- for_where
@@ -126,13 +124,11 @@ only_rules:
126124
- multiple_closures_with_trailing_closure
127125
- nesting
128126
- nimble_operator
129-
# - no_empty_block
130127
- no_extension_access_modifier
131128
- no_fallthrough_only
132129
- no_grouping_extension
133130
# - no_magic_numbers
134131
- no_space_in_method_call
135-
- non_optional_string_data_conversion
136132
- non_overridable_class_declaration
137133
- notification_center_detachment
138134
- ns_number_init_as_function_reference
@@ -141,7 +137,6 @@ only_rules:
141137
- nsobject_prefer_isequal
142138
- number_separator
143139
# - object_literal
144-
# - one_declaration_per_file
145140
- opening_brace
146141
- operator_usage_whitespace
147142
- operator_whitespace
@@ -151,7 +146,6 @@ only_rules:
151146
- override_in_extension
152147
- pattern_matching_keywords
153148
- period_spacing
154-
- prefer_key_path
155149
- prefer_nimble
156150
- prefer_self_in_static_references
157151
- prefer_self_type_over_type_of_self
@@ -187,7 +181,6 @@ only_rules:
187181
# - return_value_from_void_function
188182
- self_binding
189183
- self_in_property_initialization
190-
# - shorthand_argument
191184
- shorthand_operator
192185
- shorthand_optional_binding
193186
- single_test_class
@@ -196,7 +189,6 @@ only_rules:
196189
- sorted_imports
197190
- statement_position
198191
- static_operator
199-
- static_over_final_class
200192
- strict_fileprivate
201193
- strong_iboutlet
202194
- superfluous_disable_command
@@ -229,7 +221,6 @@ only_rules:
229221
- unused_control_flow_label
230222
- unused_enumerated
231223
- unused_optional_binding
232-
- unused_parameter
233224
- unused_setter_value
234225
- valid_ibinspectable
235226
- vertical_parameter_alignment

.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
included:
2+
- Plugins
23
- Sources
34
- Tests
45

0 commit comments

Comments
 (0)