Skip to content

Commit 85aab93

Browse files
authored
Prepared package to be used as a git submodule (#17)
1 parent de18b35 commit 85aab93

7 files changed

Lines changed: 21 additions & 57 deletions

File tree

.github/workflows/pull-request.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ jobs:
2121
platforms: ${{ steps.platforms.outputs.platforms }}
2222
scheme: ${{ steps.scheme.outputs.scheme }}
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
25+
with:
26+
submodules: true
27+
2528
- name: Setup Xcode
2629
run: sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app
2730

@@ -31,6 +34,7 @@ jobs:
3134
run: |
3235
curl https://mise.run | sh
3336
mise install
37+
3438
- name: Run linters
3539
run: mise lint
3640

@@ -68,7 +72,10 @@ jobs:
6872
matrix:
6973
platform: ${{ fromJSON(needs.prepare.outputs.platforms) }}
7074
steps:
71-
- uses: actions/checkout@v4
75+
- uses: actions/checkout@v5
76+
with:
77+
submodules: true
78+
7279
- name: Setup Xcode
7380
run: sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app
7481

@@ -109,7 +116,8 @@ jobs:
109116
set -o pipefail
110117
xcodebuild build \
111118
-scheme ${{ needs.prepare.outputs.scheme }} \
112-
-destination "${{ steps.destination.outputs.destination }}" | \
119+
-destination "${{ steps.destination.outputs.destination }}" \
120+
-IDEPackageEnablePrebuilts=NO | \
113121
xcbeautify --renderer github-actions
114122
115123
- name: Test (SPM)
@@ -129,7 +137,8 @@ jobs:
129137
set -o pipefail
130138
xcodebuild test \
131139
-scheme ${{ needs.prepare.outputs.scheme }} \
132-
-destination "${{ steps.destination.outputs.destination }}" | \
140+
-destination "${{ steps.destination.outputs.destination }}" \
141+
-IDEPackageEnablePrebuilts=NO | \
133142
xcbeautify --renderer github-actions
134143
135144
- name: Check coverage (SPM)

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ jobs:
1212
release:
1313
runs-on: macos-26
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
17+
submodules: true
1718
fetch-depth: 0
19+
1820
- name: Setup Xcode
1921
run: sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app
2022

.mise.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
[vars]
2-
sources = "Sources"
3-
tests = "Tests"
42
swiftlint = '~/.local/bin/mise x -- swiftlint'
53
swiftformat = '~/.local/bin/mise x -- swiftformat'
64

@@ -19,7 +17,7 @@ run = """
1917
{{ vars.swiftlint }} lint \
2018
--config .swiftlint.yml \
2119
--strict \
22-
{{ vars.sources }}
20+
Sources Macros
2321
"""
2422

2523
[tasks."swiftlint:tests"]
@@ -30,7 +28,7 @@ run = """
3028
--config .swiftlint.yml \
3129
--config .swiftlint.tests.yml \
3230
--strict \
33-
{{ vars.tests }}
31+
Tests
3432
"""
3533

3634
[tasks.swiftformat]

.swiftlint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ file_header:
163163
// Copyright © \d{4} .+\. All rights reserved\.
164164
//
165165
166+
excluded:
167+
- Macros/Dependencies
168+
166169
file_length:
167170
warning: 500
168171

Package.swift

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ let package = Package(
1717
.library(
1818
name: "PrincipleMacros",
1919
targets: ["PrincipleMacros"]
20-
),
21-
.library(
22-
name: "PrincipleMacrosTestSupport",
23-
targets: ["PrincipleMacrosTestSupport"]
24-
),
25-
.library(
26-
name: "PrincipleMacrosClientSupport",
27-
targets: ["PrincipleMacrosClientSupport"]
2820
)
2921
],
3022
dependencies: [
@@ -43,19 +35,6 @@ let package = Package(
4335
)
4436
]
4537
),
46-
.target(
47-
name: "PrincipleMacrosTestSupport",
48-
dependencies: [
49-
"PrincipleMacros",
50-
.product(
51-
name: "SwiftSyntaxMacrosTestSupport",
52-
package: "swift-syntax"
53-
)
54-
]
55-
),
56-
.target(
57-
name: "PrincipleMacrosClientSupport"
58-
),
5938
.testTarget(
6039
name: "PrincipleMacrosTests",
6140
dependencies: [

Sources/PrincipleMacrosClientSupport/AccessControlLevel.swift

Lines changed: 0 additions & 17 deletions
This file was deleted.

Sources/PrincipleMacrosTestSupport/Imports.swift

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)