diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index da19e5e..b6e8af2 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -21,7 +21,10 @@ jobs: platforms: ${{ steps.platforms.outputs.platforms }} scheme: ${{ steps.scheme.outputs.scheme }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 + with: + submodules: true + - name: Setup Xcode run: sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app @@ -31,6 +34,7 @@ jobs: run: | curl https://mise.run | sh mise install + - name: Run linters run: mise lint @@ -68,7 +72,10 @@ jobs: matrix: platform: ${{ fromJSON(needs.prepare.outputs.platforms) }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 + with: + submodules: true + - name: Setup Xcode run: sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app @@ -109,7 +116,8 @@ jobs: set -o pipefail xcodebuild build \ -scheme ${{ needs.prepare.outputs.scheme }} \ - -destination "${{ steps.destination.outputs.destination }}" | \ + -destination "${{ steps.destination.outputs.destination }}" \ + -IDEPackageEnablePrebuilts=NO | \ xcbeautify --renderer github-actions - name: Test (SPM) @@ -129,7 +137,8 @@ jobs: set -o pipefail xcodebuild test \ -scheme ${{ needs.prepare.outputs.scheme }} \ - -destination "${{ steps.destination.outputs.destination }}" | \ + -destination "${{ steps.destination.outputs.destination }}" \ + -IDEPackageEnablePrebuilts=NO | \ xcbeautify --renderer github-actions - name: Check coverage (SPM) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5431cec..b076f96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,9 +12,11 @@ jobs: release: runs-on: macos-26 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: + submodules: true fetch-depth: 0 + - name: Setup Xcode run: sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app diff --git a/.mise.toml b/.mise.toml index 7811bca..62cb361 100644 --- a/.mise.toml +++ b/.mise.toml @@ -1,6 +1,4 @@ [vars] -sources = "Sources" -tests = "Tests" swiftlint = '~/.local/bin/mise x -- swiftlint' swiftformat = '~/.local/bin/mise x -- swiftformat' @@ -19,7 +17,7 @@ run = """ {{ vars.swiftlint }} lint \ --config .swiftlint.yml \ --strict \ -{{ vars.sources }} +Sources Macros """ [tasks."swiftlint:tests"] @@ -30,7 +28,7 @@ run = """ --config .swiftlint.yml \ --config .swiftlint.tests.yml \ --strict \ -{{ vars.tests }} +Tests """ [tasks.swiftformat] diff --git a/.swiftlint.yml b/.swiftlint.yml index 865f9ac..fcb78ed 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -163,6 +163,9 @@ file_header: // Copyright © \d{4} .+\. All rights reserved\. // +excluded: + - Macros/Dependencies + file_length: warning: 500 diff --git a/Package.swift b/Package.swift index 6eae19f..71293a6 100644 --- a/Package.swift +++ b/Package.swift @@ -17,14 +17,6 @@ let package = Package( .library( name: "PrincipleMacros", targets: ["PrincipleMacros"] - ), - .library( - name: "PrincipleMacrosTestSupport", - targets: ["PrincipleMacrosTestSupport"] - ), - .library( - name: "PrincipleMacrosClientSupport", - targets: ["PrincipleMacrosClientSupport"] ) ], dependencies: [ @@ -43,19 +35,6 @@ let package = Package( ) ] ), - .target( - name: "PrincipleMacrosTestSupport", - dependencies: [ - "PrincipleMacros", - .product( - name: "SwiftSyntaxMacrosTestSupport", - package: "swift-syntax" - ) - ] - ), - .target( - name: "PrincipleMacrosClientSupport" - ), .testTarget( name: "PrincipleMacrosTests", dependencies: [ diff --git a/Sources/PrincipleMacrosClientSupport/AccessControlLevel.swift b/Sources/PrincipleMacrosClientSupport/AccessControlLevel.swift deleted file mode 100644 index 603b57b..0000000 --- a/Sources/PrincipleMacrosClientSupport/AccessControlLevel.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// AccessControlLevel.swift -// PrincipleMacros -// -// Created by Kamil Strzelecki on 13/11/2025. -// Copyright © 2025 Kamil Strzelecki. All rights reserved. -// - -public enum AccessControlLevel: Hashable { - - case `private` - case `fileprivate` - case `internal` - case package - case `public` - case open -} diff --git a/Sources/PrincipleMacrosTestSupport/Imports.swift b/Sources/PrincipleMacrosTestSupport/Imports.swift deleted file mode 100644 index 5ef5866..0000000 --- a/Sources/PrincipleMacrosTestSupport/Imports.swift +++ /dev/null @@ -1,10 +0,0 @@ -// -// Imports.swift -// PrincipleMacros -// -// Created by Kamil Strzelecki on 12/11/2025. -// Copyright © 2025 Kamil Strzelecki. All rights reserved. -// - -@_documentation(visibility: private) @_exported import PrincipleMacros -@_documentation(visibility: private) @_exported import SwiftSyntaxMacrosTestSupport