From dd8bbb8ff2b35c32dcdbe9ff82bd9556fc3f6247 Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 10:32:59 +0100 Subject: [PATCH 1/9] chore: build and deploy docc documentation --- .github/workflows/deploy.yml | 32 ++++++++++++++++++++++++++++++ .mise/tasks/docs/build | 5 +++++ Package.resolved | 38 +++++++++++++++++++++++++++++++++++- Package.swift | 11 ++++++----- 4 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/deploy.yml create mode 100755 .mise/tasks/docs/build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..b9202abd --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,32 @@ +on: + push: + branches: + - docs/build-docc + +jobs: + publish: + runs-on: ubuntu-latest + permissions: + contents: read + deployments: write + name: Publish to Cloudflare Pages + steps: + - name: Checkout + uses: actions/checkout@v4 + - uses: jdx/mise-action@v2 + with: + experimental: true + - name: Setup Swift + uses: SwiftyLab/setup-swift@latest + with: + swift-version: 6.0.3 + - name: Build docs + run: mise run docs:build + - name: Deploy + uses: cloudflare/wrangler-action@v3 + with: + apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} + accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + command: pages deploy .build/documentation --project-name=xcodegraph + # Optional: Enable this if you want to have GitHub Deployments triggered + gitHubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.mise/tasks/docs/build b/.mise/tasks/docs/build new file mode 100755 index 00000000..7fd8d6b9 --- /dev/null +++ b/.mise/tasks/docs/build @@ -0,0 +1,5 @@ +#!/bin/bash +# mise description="Build docs" +set -euo pipefail + +swift package --package-path $MISE_PROJECT_ROOT --allow-writing-to-directory .build/documentation generate-documentation --disable-indexing --output-path .build/documentation --transform-for-static-hosting --target XcodeGraph diff --git a/Package.resolved b/Package.resolved index 89c23aa7..80a8041e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "e0b3d78a18232f4e8d0bd5c09f120c7920018f6a53c16bc16ff38be99be54dbe", + "originHash" : "03c49df71ea05c212cda45628b910ec850be3d5268ad44afcf323333a40b1224", "pins" : [ { "identity" : "aexml", @@ -82,6 +82,15 @@ "version" : "0.10.1" } }, + { + "identity" : "swift-asn1", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-asn1.git", + "state" : { + "revision" : "ae33e5941bb88d88538d0a6b19ca0b01e6c76dcf", + "version" : "1.3.1" + } + }, { "identity" : "swift-atomics", "kind" : "remoteSourceControl", @@ -100,6 +109,33 @@ "version" : "1.1.4" } }, + { + "identity" : "swift-crypto", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-crypto.git", + "state" : { + "revision" : "ff0f781cf7c6a22d52957e50b104f5768b50c779", + "version" : "3.10.0" + } + }, + { + "identity" : "swift-docc-plugin", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-docc-plugin", + "state" : { + "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64", + "version" : "1.4.3" + } + }, + { + "identity" : "swift-docc-symbolkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-docc-symbolkit", + "state" : { + "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34", + "version" : "1.0.0" + } + }, { "identity" : "swift-log", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index 2bc8b861..b9dd3e25 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let targets: [Target] = [ "Path", ], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency"), + .enableExperimentalFeature("StrictConcurrency") ] ), .target( @@ -29,7 +29,7 @@ let targets: [Target] = [ name: "XcodeMetadataTests", dependencies: ["XcodeMetadata", "XcodeGraph"], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency"), + .enableExperimentalFeature("StrictConcurrency") ] ), .target( @@ -42,14 +42,14 @@ let targets: [Target] = [ .product(name: "XcodeProj", package: "XcodeProj"), ], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency"), + .enableExperimentalFeature("StrictConcurrency") ] ), .testTarget( name: "XcodeGraphTests", dependencies: [.target(name: "XcodeGraph")], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency"), + .enableExperimentalFeature("StrictConcurrency") ] ), .testTarget( @@ -59,7 +59,7 @@ let targets: [Target] = [ .product(name: "FileSystem", package: "FileSystem"), ], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency"), + .enableExperimentalFeature("StrictConcurrency") ] ), ] @@ -83,6 +83,7 @@ let package = Package( .package(url: "https://github.com/apple/swift-service-context", .upToNextMajor(from: "1.0.0")), .package(url: "https://github.com/Kolos65/Mockable.git", .upToNextMajor(from: "0.0.11")), .package(url: "https://github.com/p-x9/MachOKit", .upToNextMajor(from: "0.28.0")), + .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"), ], targets: targets ) From 3c781c458a588fd1256abaab806dd6dbf8d401ec Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 11:31:34 +0100 Subject: [PATCH 2/9] Enable combined documentation --- .mise/tasks/docs/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mise/tasks/docs/build b/.mise/tasks/docs/build index 7fd8d6b9..2b3d741d 100755 --- a/.mise/tasks/docs/build +++ b/.mise/tasks/docs/build @@ -2,4 +2,4 @@ # mise description="Build docs" set -euo pipefail -swift package --package-path $MISE_PROJECT_ROOT --allow-writing-to-directory .build/documentation generate-documentation --disable-indexing --output-path .build/documentation --transform-for-static-hosting --target XcodeGraph +swift package --package-path $MISE_PROJECT_ROOT --allow-writing-to-directory .build/documentation generate-documentation --disable-indexing --output-path .build/documentation --transform-for-static-hosting --enable-experimental-combined-documentation --target XcodeGraph --target XcodeProjMapper --target XcodeMetadata From 964de6b2b2fbeb384466911ba32a88402cbc22ba Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 11:38:36 +0100 Subject: [PATCH 3/9] Skip building XcodeMetadata --- .mise/tasks/docs/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mise/tasks/docs/build b/.mise/tasks/docs/build index 2b3d741d..0c00b922 100755 --- a/.mise/tasks/docs/build +++ b/.mise/tasks/docs/build @@ -2,4 +2,4 @@ # mise description="Build docs" set -euo pipefail -swift package --package-path $MISE_PROJECT_ROOT --allow-writing-to-directory .build/documentation generate-documentation --disable-indexing --output-path .build/documentation --transform-for-static-hosting --enable-experimental-combined-documentation --target XcodeGraph --target XcodeProjMapper --target XcodeMetadata +swift package --package-path $MISE_PROJECT_ROOT --allow-writing-to-directory .build/documentation generate-documentation --disable-indexing --output-path .build/documentation --transform-for-static-hosting --enable-experimental-combined-documentation --target XcodeGraph --target XcodeProjMapper From 4f9f7902de2ac3a49ca02180cce91c4cfbc77f5c Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 11:54:27 +0100 Subject: [PATCH 4/9] Use development toolchain --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b9202abd..e375b77f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Swift uses: SwiftyLab/setup-swift@latest with: - swift-version: 6.0.3 + development: true - name: Build docs run: mise run docs:build - name: Deploy From 812e12937dac916de1cf771d1fefe6cf814c3b4b Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 12:34:54 +0100 Subject: [PATCH 5/9] Update Mockable --- Package.resolved | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/Package.resolved b/Package.resolved index 80a8041e..15964b2e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Kolos65/Mockable.git", "state" : { - "revision" : "e1b311b01c11415099341eee49769185e965ac4c", - "version" : "0.2.0" + "revision" : "203336d0ccb7ff03a8a03db54a4fa18fc2b0c771", + "version" : "0.3.0" } }, { @@ -82,15 +82,6 @@ "version" : "0.10.1" } }, - { - "identity" : "swift-asn1", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-asn1.git", - "state" : { - "revision" : "ae33e5941bb88d88538d0a6b19ca0b01e6c76dcf", - "version" : "1.3.1" - } - }, { "identity" : "swift-atomics", "kind" : "remoteSourceControl", @@ -109,15 +100,6 @@ "version" : "1.1.4" } }, - { - "identity" : "swift-crypto", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-crypto.git", - "state" : { - "revision" : "ff0f781cf7c6a22d52957e50b104f5768b50c779", - "version" : "3.10.0" - } - }, { "identity" : "swift-docc-plugin", "kind" : "remoteSourceControl", From 54a53c6ee3e98d5f54c788902eb44d6fc23ee0a1 Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 12:42:37 +0100 Subject: [PATCH 6/9] Revert back to the latest version --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e375b77f..b9202abd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Swift uses: SwiftyLab/setup-swift@latest with: - development: true + swift-version: 6.0.3 - name: Build docs run: mise run docs:build - name: Deploy From 3f3df3f229ba3793c7248e44fa65ac0f846a7dfb Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 12:49:57 +0100 Subject: [PATCH 7/9] Add build docs workflow --- .github/workflows/deploy.yml | 3 +-- .github/workflows/docs.yml | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/docs.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b9202abd..27a5c148 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,7 +1,7 @@ on: push: branches: - - docs/build-docc + - main jobs: publish: @@ -28,5 +28,4 @@ jobs: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} command: pages deploy .build/documentation --project-name=xcodegraph - # Optional: Enable this if you want to have GitHub Deployments triggered gitHubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 00000000..95c0a401 --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,29 @@ +name: Docs + +on: + push: + branches: + - main + pull_request: + merge_group: + +concurrency: + group: docs-${{ github.head_ref }} + cancel-in-progress: true + +jobs: + build: + name: Build + runs-on: "ubuntu-latest" + timeout-minutes: 15 + steps: + - uses: actions/checkout@v4 + - uses: jdx/mise-action@v2 + with: + experimental: true + - name: Setup Swift + uses: SwiftyLab/setup-swift@latest + with: + swift-version: 6.0.3 + - name: Build docs + run: mise run docs:build From 0bc290c608944b2244dcb6ea5a626d305d29dcdf Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 14:49:07 +0100 Subject: [PATCH 8/9] Rename XcodeProjMapper to XcodeGraphMapper --- .github/workflows/XcodeGraph.yml | 4 ++-- .mise/tasks/docs/build | 2 +- CHANGELOG.md | 2 +- Package.swift | 8 ++++---- README.md | 2 ++ .../Documentation.docc/XcodeProjMapper.md | 6 +++--- .../Extensions/PBXProject+Extensions.swift | 0 .../Extensions/Package+Extensions.swift | 0 .../Extensions/Platform+Extensions.swift | 0 .../Extensions/PlatformFilter+Extensions.swift | 0 .../Extensions/TargetDependency+Extensions.swift | 0 .../Extensions/XCWorkspace+Extensions.swift | 0 .../XCWorkspaceDataFileRef+Extensions.swift | 0 .../Mappers/Graph/XcodeGraphMapper.swift | 0 .../Mappers/Packages/XCPackageMapper.swift | 0 .../Mappers/Phases/BuildPhaseConstants.swift | 0 .../Phases/PBXCopyFilesBuildPhaseMapper.swift | 0 .../PBXCoreDataModelsBuildPhaseMapper.swift | 0 .../Phases/PBXFrameworksBuildPhaseMapper.swift | 0 .../Phases/PBXHeadersBuildPhaseMapper.swift | 0 .../Phases/PBXResourcesBuildPhaseMapper.swift | 0 .../Phases/PBXScriptsBuildPhaseMapper.swift | 0 .../Phases/PBXSourcesBuildPhaseMapper.swift | 0 .../Mappers/Project/PBXProjectMapper.swift | 0 .../Mappers/Project/ProjectAttribute.swift | 0 .../Mappers/Project/XcodeProj+Extensions.swift | 0 .../SchemeDiagnosticsOptions+XCScheme.swift | 0 .../Mappers/Schemes/XCSchemeMapper.swift | 0 .../Mappers/Settings/BuildSettings.swift | 0 .../Settings/XCConfigurationList+Helpers.swift | 0 .../Mappers/Settings/XCConfigurationMapper.swift | 0 .../Mappers/Targets/PBXBuildRuleMapper.swift | 0 .../Mappers/Targets/PBXTarget+BuildHeaders.swift | 0 .../Targets/PBXTarget+BuildSettings.swift | 0 .../Mappers/Targets/PBXTarget+GraphMapping.swift | 0 .../Targets/PBXTarget+PlatformInference.swift | 0 .../PBXTargetDependency+PlatformCondition.swift | 0 .../Targets/PBXTargetDependencyMapper.swift | 0 .../Mappers/Targets/PBXTargetMapper.swift | 0 .../Targets/TargetDependency+GraphMapping.swift | 0 .../Mappers/Workspace/XCWorkspaceMapper.swift | 0 .../Utilities/ConfigurationMatcher.swift | 0 .../Utilities/DeveloperDirectoryProvider.swift | 0 .../Utilities/Optional+Throwing.swift | 0 .../Utilities/PathDependencyMapper.swift | 0 .../MapperTests/Graph/GraphMapperTests.swift | 2 +- .../Package/XCPackageMapperTests.swift | 2 +- .../PBXCopyFilesBuildPhaseMapperTests.swift | 2 +- .../PBXCoreDataModelsBuildPhaseMapperTests.swift | 2 +- .../PBXFrameworksBuildPhaseMapperTests.swift | 2 +- .../Phases/PBXHeadersBuildPhaseMapperTests.swift | 2 +- .../PBXResourcesBuildPhaseMapperTests.swift | 2 +- .../Phases/PBXScriptsBuildPhaseMapperTests.swift | 2 +- .../Phases/PBXSourcesBuildPhaseMapperTests.swift | 2 +- .../Project/PBXProjectMapperTests.swift | 2 +- .../Schemes/XCSchemeMapperTests.swift | 9 ++++++--- .../Settings/BuildSettingsTests.swift | 2 +- .../Settings/ConfigurationMatcherTests.swift | 2 +- .../Settings/XCConfigurationMapperTests.swift | 2 +- .../Target/PBXBuildRuleMapperTests.swift | 2 +- .../Target/PBXTargetDependencyMapper.swift | 2 +- .../Target/PBXTargetMapperTests.swift | 2 +- .../Target/TargetDependencyExtensionsTests.swift | 2 +- .../Workspace/XCWorkspaceMapperTests.swift | 2 +- .../Mocks/AssertionsTesting.swift | 0 .../Mocks/MockDefaults.swift | 0 .../TestData/.swift | 0 .../TestData/PBXBuildRule+TestData.swift | 0 .../TestData/PBXFileReference+TestData.swift | 0 .../TestData/PBXGroup+TestData.swift | 0 .../TestData/PBXNativeTarget+TestData.swift | 0 .../TestData/PBXProj+TestData.swift | 0 .../TestData/PBXProject+TestData.swift | 0 .../PBXShellScriptBuildPhase+TestData.swift | 0 .../TestData/PBXTargetDependency+TestData.swift | 0 .../TestData/PBXVariantGroup+TestData.swift | 0 .../TestData/XCBuildConfiguration+TestData.swift | 0 .../TestData/XCConfigurationList+TestData.swift | 0 .../TestData/XCScheme+TestData.swift | 0 .../XCSchemeTestableReference+TestData.swift | 0 .../TestData/XCUserData+TestData.swift | 0 .../TestData/XCVersionGroup+TestData.swift | 0 .../TestData/XCWorkspace+TestData.swift | 0 .../XCWorkspaceDataElement+TestData.swift | 0 .../TestData/XCWorkspaceDataGroup+TestData.swift | 0 .../TestData/XcodeProj+TestData.swift | 0 Tuist/ProjectDescriptionHelpers/Module.swift | 16 ++++++++-------- 87 files changed, 45 insertions(+), 40 deletions(-) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Documentation.docc/XcodeProjMapper.md (69%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Extensions/PBXProject+Extensions.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Extensions/Package+Extensions.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Extensions/Platform+Extensions.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Extensions/PlatformFilter+Extensions.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Extensions/TargetDependency+Extensions.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Extensions/XCWorkspace+Extensions.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Extensions/XCWorkspaceDataFileRef+Extensions.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Graph/XcodeGraphMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Packages/XCPackageMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Phases/BuildPhaseConstants.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Phases/PBXCopyFilesBuildPhaseMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Phases/PBXCoreDataModelsBuildPhaseMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Phases/PBXFrameworksBuildPhaseMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Phases/PBXHeadersBuildPhaseMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Phases/PBXResourcesBuildPhaseMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Phases/PBXScriptsBuildPhaseMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Phases/PBXSourcesBuildPhaseMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Project/PBXProjectMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Project/ProjectAttribute.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Project/XcodeProj+Extensions.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Schemes/SchemeDiagnosticsOptions+XCScheme.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Schemes/XCSchemeMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Settings/BuildSettings.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Settings/XCConfigurationList+Helpers.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Settings/XCConfigurationMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/PBXBuildRuleMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/PBXTarget+BuildHeaders.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/PBXTarget+BuildSettings.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/PBXTarget+GraphMapping.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/PBXTarget+PlatformInference.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/PBXTargetDependency+PlatformCondition.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/PBXTargetDependencyMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/PBXTargetMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Targets/TargetDependency+GraphMapping.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Mappers/Workspace/XCWorkspaceMapper.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Utilities/ConfigurationMatcher.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Utilities/DeveloperDirectoryProvider.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Utilities/Optional+Throwing.swift (100%) rename Sources/{XcodeProjMapper => XcodeGraphMapper}/Utilities/PathDependencyMapper.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Graph/GraphMapperTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Package/XCPackageMapperTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Phases/PBXCopyFilesBuildPhaseMapperTests.swift (98%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Phases/PBXCoreDataModelsBuildPhaseMapperTests.swift (98%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Phases/PBXFrameworksBuildPhaseMapperTests.swift (97%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Phases/PBXHeadersBuildPhaseMapperTests.swift (98%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Phases/PBXResourcesBuildPhaseMapperTests.swift (98%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Phases/PBXScriptsBuildPhaseMapperTests.swift (98%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Phases/PBXSourcesBuildPhaseMapperTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Project/PBXProjectMapperTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Schemes/XCSchemeMapperTests.swift (97%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Settings/BuildSettingsTests.swift (98%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Settings/ConfigurationMatcherTests.swift (98%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Settings/XCConfigurationMapperTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Target/PBXBuildRuleMapperTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Target/PBXTargetDependencyMapper.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Target/PBXTargetMapperTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Target/TargetDependencyExtensionsTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/MapperTests/Workspace/XCWorkspaceMapperTests.swift (99%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/Mocks/AssertionsTesting.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/Mocks/MockDefaults.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXBuildRule+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXFileReference+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXGroup+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXNativeTarget+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXProj+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXProject+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXShellScriptBuildPhase+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXTargetDependency+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/PBXVariantGroup+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCBuildConfiguration+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCConfigurationList+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCScheme+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCSchemeTestableReference+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCUserData+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCVersionGroup+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCWorkspace+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCWorkspaceDataElement+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XCWorkspaceDataGroup+TestData.swift (100%) rename Tests/{XcodeProjMapperTests => XcodeGraphMapperTests}/TestData/XcodeProj+TestData.swift (100%) diff --git a/.github/workflows/XcodeGraph.yml b/.github/workflows/XcodeGraph.yml index 2c3b8f06..cfc1e1e1 100644 --- a/.github/workflows/XcodeGraph.yml +++ b/.github/workflows/XcodeGraph.yml @@ -2,7 +2,7 @@ name: XcodeGraph on: push: branches: - - "**" + - "main" tags-ignore: - "**" paths: @@ -51,7 +51,7 @@ jobs: - name: Test on Linux if: matrix.os == 'ubuntu-22.04' # These momdules rely on some Xcode utilities like xcode-select - run: swift test --skip XcodeProjMapperTests --skip XcodeMetadataTests + run: swift test --skip XcodeGraphMapperTests --skip XcodeMetadataTests - name: Test if: matrix.os != 'ubuntu-22.04' run: swift test diff --git a/.mise/tasks/docs/build b/.mise/tasks/docs/build index 0c00b922..23a0ef1e 100755 --- a/.mise/tasks/docs/build +++ b/.mise/tasks/docs/build @@ -2,4 +2,4 @@ # mise description="Build docs" set -euo pipefail -swift package --package-path $MISE_PROJECT_ROOT --allow-writing-to-directory .build/documentation generate-documentation --disable-indexing --output-path .build/documentation --transform-for-static-hosting --enable-experimental-combined-documentation --target XcodeGraph --target XcodeProjMapper +swift package --package-path $MISE_PROJECT_ROOT --allow-writing-to-directory .build/documentation generate-documentation --disable-indexing --output-path .build/documentation --transform-for-static-hosting --enable-experimental-combined-documentation --target XcodeGraph --target XcodeGraphMapper diff --git a/CHANGELOG.md b/CHANGELOG.md index 06a59ed4..b403bcf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.4.0] - 2025-02-05 ### Details #### Feat -- Introduce XcodeProjMapper to map XcodeProj to XcodeGraph by @ajkolean in [#87](https://github.com/tuist/XcodeGraph/pull/87) +- Introduce XcodeGraphMapper to map XcodeProj to XcodeGraph by @ajkolean in [#87](https://github.com/tuist/XcodeGraph/pull/87) ## New Contributors * @ajkolean made their first contribution in [#87](https://github.com/tuist/XcodeGraph/pull/87) diff --git a/Package.swift b/Package.swift index b9dd3e25..b823ba1d 100644 --- a/Package.swift +++ b/Package.swift @@ -33,7 +33,7 @@ let targets: [Target] = [ ] ), .target( - name: "XcodeProjMapper", + name: "XcodeGraphMapper", dependencies: [ "XcodeGraph", "XcodeMetadata", @@ -53,9 +53,9 @@ let targets: [Target] = [ ] ), .testTarget( - name: "XcodeProjMapperTests", + name: "XcodeGraphMapperTests", dependencies: [ - "XcodeProjMapper", + "XcodeGraphMapper", .product(name: "FileSystem", package: "FileSystem"), ], swiftSettings: [ @@ -72,7 +72,7 @@ let package = Package( name: "XcodeGraph", targets: ["XcodeGraph"] ), - .library(name: "XcodeProjMapper", targets: ["XcodeProjMapper"]), + .library(name: "XcodeGraphMapper", targets: ["XcodeGraphMapper"]), ], dependencies: [ .package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.7")), diff --git a/README.md b/README.md index 1ee6be33..cb338b09 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,8 @@ let package = Package( ## XcodeGraphMapper +- [Documentation](https://xcodegraph.pages.dev/documentation/XcodeGraphMapper) + XcodeGraphMapper parses `.xcworkspace` or `.xcodeproj` files using `XcodeProj` and constructs a `XcodeGraph.Graph` representing their projects, targets, and dependencies: ### Usage diff --git a/Sources/XcodeProjMapper/Documentation.docc/XcodeProjMapper.md b/Sources/XcodeGraphMapper/Documentation.docc/XcodeProjMapper.md similarity index 69% rename from Sources/XcodeProjMapper/Documentation.docc/XcodeProjMapper.md rename to Sources/XcodeGraphMapper/Documentation.docc/XcodeProjMapper.md index 0091e6da..84ca67c6 100644 --- a/Sources/XcodeProjMapper/Documentation.docc/XcodeProjMapper.md +++ b/Sources/XcodeGraphMapper/Documentation.docc/XcodeProjMapper.md @@ -1,4 +1,4 @@ -# ``XcodeProjMapper`` +# ``XcodeGraphMapper`` @Metadata { @DisplayName("Xcode Project Mapper") @@ -10,9 +10,9 @@ A tool that maps Xcode projects (`.xcodeproj` and `.xcworkspace`) into a structu ## Overview -``XcodeProjMapper`` leverages ``XcodeProj`` to parse and navigate Xcode project files, then translates them into a domain-specific graph model (``XcodeGraph/Graph``). This model captures all essential components—projects, targets, packages, dependencies, build settings, schemes, and more—providing a high-level, language-agnostic structure for further processing. +``XcodeGraphMapper`` leverages ``XcodeProj`` to parse and navigate Xcode project files, then translates them into a domain-specific graph model (``XcodeGraph/Graph``). This model captures all essential components—projects, targets, packages, dependencies, build settings, schemes, and more—providing a high-level, language-agnostic structure for further processing. -By using this graph-based representation, you can easily analyze project configurations, visualize complex dependency graphs, or integrate advanced workflows into your build pipelines. For example, teams can leverage ``XcodeProjMapper`` to: +By using this graph-based representation, you can easily analyze project configurations, visualize complex dependency graphs, or integrate advanced workflows into your build pipelines. For example, teams can leverage ``XcodeGraphMapper`` to: - Generate code based on discovered resources and targets. - Validate project configurations and detect missing bundle identifiers or invalid references. diff --git a/Sources/XcodeProjMapper/Extensions/PBXProject+Extensions.swift b/Sources/XcodeGraphMapper/Extensions/PBXProject+Extensions.swift similarity index 100% rename from Sources/XcodeProjMapper/Extensions/PBXProject+Extensions.swift rename to Sources/XcodeGraphMapper/Extensions/PBXProject+Extensions.swift diff --git a/Sources/XcodeProjMapper/Extensions/Package+Extensions.swift b/Sources/XcodeGraphMapper/Extensions/Package+Extensions.swift similarity index 100% rename from Sources/XcodeProjMapper/Extensions/Package+Extensions.swift rename to Sources/XcodeGraphMapper/Extensions/Package+Extensions.swift diff --git a/Sources/XcodeProjMapper/Extensions/Platform+Extensions.swift b/Sources/XcodeGraphMapper/Extensions/Platform+Extensions.swift similarity index 100% rename from Sources/XcodeProjMapper/Extensions/Platform+Extensions.swift rename to Sources/XcodeGraphMapper/Extensions/Platform+Extensions.swift diff --git a/Sources/XcodeProjMapper/Extensions/PlatformFilter+Extensions.swift b/Sources/XcodeGraphMapper/Extensions/PlatformFilter+Extensions.swift similarity index 100% rename from Sources/XcodeProjMapper/Extensions/PlatformFilter+Extensions.swift rename to Sources/XcodeGraphMapper/Extensions/PlatformFilter+Extensions.swift diff --git a/Sources/XcodeProjMapper/Extensions/TargetDependency+Extensions.swift b/Sources/XcodeGraphMapper/Extensions/TargetDependency+Extensions.swift similarity index 100% rename from Sources/XcodeProjMapper/Extensions/TargetDependency+Extensions.swift rename to Sources/XcodeGraphMapper/Extensions/TargetDependency+Extensions.swift diff --git a/Sources/XcodeProjMapper/Extensions/XCWorkspace+Extensions.swift b/Sources/XcodeGraphMapper/Extensions/XCWorkspace+Extensions.swift similarity index 100% rename from Sources/XcodeProjMapper/Extensions/XCWorkspace+Extensions.swift rename to Sources/XcodeGraphMapper/Extensions/XCWorkspace+Extensions.swift diff --git a/Sources/XcodeProjMapper/Extensions/XCWorkspaceDataFileRef+Extensions.swift b/Sources/XcodeGraphMapper/Extensions/XCWorkspaceDataFileRef+Extensions.swift similarity index 100% rename from Sources/XcodeProjMapper/Extensions/XCWorkspaceDataFileRef+Extensions.swift rename to Sources/XcodeGraphMapper/Extensions/XCWorkspaceDataFileRef+Extensions.swift diff --git a/Sources/XcodeProjMapper/Mappers/Graph/XcodeGraphMapper.swift b/Sources/XcodeGraphMapper/Mappers/Graph/XcodeGraphMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Graph/XcodeGraphMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Graph/XcodeGraphMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Packages/XCPackageMapper.swift b/Sources/XcodeGraphMapper/Mappers/Packages/XCPackageMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Packages/XCPackageMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Packages/XCPackageMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Phases/BuildPhaseConstants.swift b/Sources/XcodeGraphMapper/Mappers/Phases/BuildPhaseConstants.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Phases/BuildPhaseConstants.swift rename to Sources/XcodeGraphMapper/Mappers/Phases/BuildPhaseConstants.swift diff --git a/Sources/XcodeProjMapper/Mappers/Phases/PBXCopyFilesBuildPhaseMapper.swift b/Sources/XcodeGraphMapper/Mappers/Phases/PBXCopyFilesBuildPhaseMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Phases/PBXCopyFilesBuildPhaseMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Phases/PBXCopyFilesBuildPhaseMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Phases/PBXCoreDataModelsBuildPhaseMapper.swift b/Sources/XcodeGraphMapper/Mappers/Phases/PBXCoreDataModelsBuildPhaseMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Phases/PBXCoreDataModelsBuildPhaseMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Phases/PBXCoreDataModelsBuildPhaseMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Phases/PBXFrameworksBuildPhaseMapper.swift b/Sources/XcodeGraphMapper/Mappers/Phases/PBXFrameworksBuildPhaseMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Phases/PBXFrameworksBuildPhaseMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Phases/PBXFrameworksBuildPhaseMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Phases/PBXHeadersBuildPhaseMapper.swift b/Sources/XcodeGraphMapper/Mappers/Phases/PBXHeadersBuildPhaseMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Phases/PBXHeadersBuildPhaseMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Phases/PBXHeadersBuildPhaseMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Phases/PBXResourcesBuildPhaseMapper.swift b/Sources/XcodeGraphMapper/Mappers/Phases/PBXResourcesBuildPhaseMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Phases/PBXResourcesBuildPhaseMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Phases/PBXResourcesBuildPhaseMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Phases/PBXScriptsBuildPhaseMapper.swift b/Sources/XcodeGraphMapper/Mappers/Phases/PBXScriptsBuildPhaseMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Phases/PBXScriptsBuildPhaseMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Phases/PBXScriptsBuildPhaseMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Phases/PBXSourcesBuildPhaseMapper.swift b/Sources/XcodeGraphMapper/Mappers/Phases/PBXSourcesBuildPhaseMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Phases/PBXSourcesBuildPhaseMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Phases/PBXSourcesBuildPhaseMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Project/PBXProjectMapper.swift b/Sources/XcodeGraphMapper/Mappers/Project/PBXProjectMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Project/PBXProjectMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Project/PBXProjectMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Project/ProjectAttribute.swift b/Sources/XcodeGraphMapper/Mappers/Project/ProjectAttribute.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Project/ProjectAttribute.swift rename to Sources/XcodeGraphMapper/Mappers/Project/ProjectAttribute.swift diff --git a/Sources/XcodeProjMapper/Mappers/Project/XcodeProj+Extensions.swift b/Sources/XcodeGraphMapper/Mappers/Project/XcodeProj+Extensions.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Project/XcodeProj+Extensions.swift rename to Sources/XcodeGraphMapper/Mappers/Project/XcodeProj+Extensions.swift diff --git a/Sources/XcodeProjMapper/Mappers/Schemes/SchemeDiagnosticsOptions+XCScheme.swift b/Sources/XcodeGraphMapper/Mappers/Schemes/SchemeDiagnosticsOptions+XCScheme.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Schemes/SchemeDiagnosticsOptions+XCScheme.swift rename to Sources/XcodeGraphMapper/Mappers/Schemes/SchemeDiagnosticsOptions+XCScheme.swift diff --git a/Sources/XcodeProjMapper/Mappers/Schemes/XCSchemeMapper.swift b/Sources/XcodeGraphMapper/Mappers/Schemes/XCSchemeMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Schemes/XCSchemeMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Schemes/XCSchemeMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Settings/BuildSettings.swift b/Sources/XcodeGraphMapper/Mappers/Settings/BuildSettings.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Settings/BuildSettings.swift rename to Sources/XcodeGraphMapper/Mappers/Settings/BuildSettings.swift diff --git a/Sources/XcodeProjMapper/Mappers/Settings/XCConfigurationList+Helpers.swift b/Sources/XcodeGraphMapper/Mappers/Settings/XCConfigurationList+Helpers.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Settings/XCConfigurationList+Helpers.swift rename to Sources/XcodeGraphMapper/Mappers/Settings/XCConfigurationList+Helpers.swift diff --git a/Sources/XcodeProjMapper/Mappers/Settings/XCConfigurationMapper.swift b/Sources/XcodeGraphMapper/Mappers/Settings/XCConfigurationMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Settings/XCConfigurationMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Settings/XCConfigurationMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/PBXBuildRuleMapper.swift b/Sources/XcodeGraphMapper/Mappers/Targets/PBXBuildRuleMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/PBXBuildRuleMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/PBXBuildRuleMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/PBXTarget+BuildHeaders.swift b/Sources/XcodeGraphMapper/Mappers/Targets/PBXTarget+BuildHeaders.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/PBXTarget+BuildHeaders.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/PBXTarget+BuildHeaders.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/PBXTarget+BuildSettings.swift b/Sources/XcodeGraphMapper/Mappers/Targets/PBXTarget+BuildSettings.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/PBXTarget+BuildSettings.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/PBXTarget+BuildSettings.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/PBXTarget+GraphMapping.swift b/Sources/XcodeGraphMapper/Mappers/Targets/PBXTarget+GraphMapping.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/PBXTarget+GraphMapping.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/PBXTarget+GraphMapping.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/PBXTarget+PlatformInference.swift b/Sources/XcodeGraphMapper/Mappers/Targets/PBXTarget+PlatformInference.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/PBXTarget+PlatformInference.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/PBXTarget+PlatformInference.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/PBXTargetDependency+PlatformCondition.swift b/Sources/XcodeGraphMapper/Mappers/Targets/PBXTargetDependency+PlatformCondition.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/PBXTargetDependency+PlatformCondition.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/PBXTargetDependency+PlatformCondition.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/PBXTargetDependencyMapper.swift b/Sources/XcodeGraphMapper/Mappers/Targets/PBXTargetDependencyMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/PBXTargetDependencyMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/PBXTargetDependencyMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/PBXTargetMapper.swift b/Sources/XcodeGraphMapper/Mappers/Targets/PBXTargetMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/PBXTargetMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/PBXTargetMapper.swift diff --git a/Sources/XcodeProjMapper/Mappers/Targets/TargetDependency+GraphMapping.swift b/Sources/XcodeGraphMapper/Mappers/Targets/TargetDependency+GraphMapping.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Targets/TargetDependency+GraphMapping.swift rename to Sources/XcodeGraphMapper/Mappers/Targets/TargetDependency+GraphMapping.swift diff --git a/Sources/XcodeProjMapper/Mappers/Workspace/XCWorkspaceMapper.swift b/Sources/XcodeGraphMapper/Mappers/Workspace/XCWorkspaceMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Mappers/Workspace/XCWorkspaceMapper.swift rename to Sources/XcodeGraphMapper/Mappers/Workspace/XCWorkspaceMapper.swift diff --git a/Sources/XcodeProjMapper/Utilities/ConfigurationMatcher.swift b/Sources/XcodeGraphMapper/Utilities/ConfigurationMatcher.swift similarity index 100% rename from Sources/XcodeProjMapper/Utilities/ConfigurationMatcher.swift rename to Sources/XcodeGraphMapper/Utilities/ConfigurationMatcher.swift diff --git a/Sources/XcodeProjMapper/Utilities/DeveloperDirectoryProvider.swift b/Sources/XcodeGraphMapper/Utilities/DeveloperDirectoryProvider.swift similarity index 100% rename from Sources/XcodeProjMapper/Utilities/DeveloperDirectoryProvider.swift rename to Sources/XcodeGraphMapper/Utilities/DeveloperDirectoryProvider.swift diff --git a/Sources/XcodeProjMapper/Utilities/Optional+Throwing.swift b/Sources/XcodeGraphMapper/Utilities/Optional+Throwing.swift similarity index 100% rename from Sources/XcodeProjMapper/Utilities/Optional+Throwing.swift rename to Sources/XcodeGraphMapper/Utilities/Optional+Throwing.swift diff --git a/Sources/XcodeProjMapper/Utilities/PathDependencyMapper.swift b/Sources/XcodeGraphMapper/Utilities/PathDependencyMapper.swift similarity index 100% rename from Sources/XcodeProjMapper/Utilities/PathDependencyMapper.swift rename to Sources/XcodeGraphMapper/Utilities/PathDependencyMapper.swift diff --git a/Tests/XcodeProjMapperTests/MapperTests/Graph/GraphMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Graph/GraphMapperTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Graph/GraphMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Graph/GraphMapperTests.swift index ed3eb39c..c61bfaab 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Graph/GraphMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Graph/GraphMapperTests.swift @@ -3,7 +3,7 @@ import Path import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct XcodeGraphMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Package/XCPackageMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Package/XCPackageMapperTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Package/XCPackageMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Package/XCPackageMapperTests.swift index 44cc77a2..2fbb5c6f 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Package/XCPackageMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Package/XCPackageMapperTests.swift @@ -2,7 +2,7 @@ import Path import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct XCPackageMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXCopyFilesBuildPhaseMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXCopyFilesBuildPhaseMapperTests.swift similarity index 98% rename from Tests/XcodeProjMapperTests/MapperTests/Phases/PBXCopyFilesBuildPhaseMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXCopyFilesBuildPhaseMapperTests.swift index 98149258..1149c452 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXCopyFilesBuildPhaseMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXCopyFilesBuildPhaseMapperTests.swift @@ -1,7 +1,7 @@ import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXCopyFilesBuildPhaseMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXCoreDataModelsBuildPhaseMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXCoreDataModelsBuildPhaseMapperTests.swift similarity index 98% rename from Tests/XcodeProjMapperTests/MapperTests/Phases/PBXCoreDataModelsBuildPhaseMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXCoreDataModelsBuildPhaseMapperTests.swift index f7a2eb5f..ee0f2b06 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXCoreDataModelsBuildPhaseMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXCoreDataModelsBuildPhaseMapperTests.swift @@ -1,7 +1,7 @@ import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXCoreDataModelsBuildPhaseMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXFrameworksBuildPhaseMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXFrameworksBuildPhaseMapperTests.swift similarity index 97% rename from Tests/XcodeProjMapperTests/MapperTests/Phases/PBXFrameworksBuildPhaseMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXFrameworksBuildPhaseMapperTests.swift index a0e3bfab..37d2dac4 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXFrameworksBuildPhaseMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXFrameworksBuildPhaseMapperTests.swift @@ -1,7 +1,7 @@ import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXFrameworksBuildPhaseMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXHeadersBuildPhaseMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXHeadersBuildPhaseMapperTests.swift similarity index 98% rename from Tests/XcodeProjMapperTests/MapperTests/Phases/PBXHeadersBuildPhaseMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXHeadersBuildPhaseMapperTests.swift index 93d61329..710ba70f 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXHeadersBuildPhaseMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXHeadersBuildPhaseMapperTests.swift @@ -1,7 +1,7 @@ import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXHeadersBuildPhaseMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXResourcesBuildPhaseMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXResourcesBuildPhaseMapperTests.swift similarity index 98% rename from Tests/XcodeProjMapperTests/MapperTests/Phases/PBXResourcesBuildPhaseMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXResourcesBuildPhaseMapperTests.swift index 38faec55..2a3cce15 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXResourcesBuildPhaseMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXResourcesBuildPhaseMapperTests.swift @@ -1,7 +1,7 @@ import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXResourcesBuildPhaseMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXScriptsBuildPhaseMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXScriptsBuildPhaseMapperTests.swift similarity index 98% rename from Tests/XcodeProjMapperTests/MapperTests/Phases/PBXScriptsBuildPhaseMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXScriptsBuildPhaseMapperTests.swift index 16869a4d..c14217ca 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXScriptsBuildPhaseMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXScriptsBuildPhaseMapperTests.swift @@ -1,7 +1,7 @@ import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXScriptsBuildPhaseMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXSourcesBuildPhaseMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXSourcesBuildPhaseMapperTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Phases/PBXSourcesBuildPhaseMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXSourcesBuildPhaseMapperTests.swift index 86e362ec..b55f1101 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Phases/PBXSourcesBuildPhaseMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Phases/PBXSourcesBuildPhaseMapperTests.swift @@ -1,7 +1,7 @@ import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXSourcesBuildPhaseMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Project/PBXProjectMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Project/PBXProjectMapperTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Project/PBXProjectMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Project/PBXProjectMapperTests.swift index 83d4a67d..02b6ef8d 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Project/PBXProjectMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Project/PBXProjectMapperTests.swift @@ -2,7 +2,7 @@ import Path import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXProjectMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift similarity index 97% rename from Tests/XcodeProjMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift index f6a2b15d..82d404b1 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift @@ -2,8 +2,9 @@ import AEXML import Path import Testing import XcodeGraph + +@testable import XcodeGraphMapper @testable import XcodeProj -@testable import XcodeProjMapper @Suite struct XCSchemeMapperTests { @@ -135,8 +136,10 @@ struct XCSchemeMapperTests { blueprintName: "App" ) let runnable = XCScheme.BuildableProductRunnable(buildableReference: targetRef) - let envVar = XCScheme.EnvironmentVariable(variable: "RUN_ENV", value: "run_value", enabled: true) - let launchArg = XCScheme.CommandLineArguments.CommandLineArgument(name: "run_arg", enabled: true) + let envVar = XCScheme.EnvironmentVariable( + variable: "RUN_ENV", value: "run_value", enabled: true) + let launchArg = XCScheme.CommandLineArguments.CommandLineArgument( + name: "run_arg", enabled: true) let element = runnable.xmlElement() let launchAction = XCScheme.LaunchAction( runnable: try .init(element: element), diff --git a/Tests/XcodeProjMapperTests/MapperTests/Settings/BuildSettingsTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Settings/BuildSettingsTests.swift similarity index 98% rename from Tests/XcodeProjMapperTests/MapperTests/Settings/BuildSettingsTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Settings/BuildSettingsTests.swift index bb4d1d00..f27be5f9 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Settings/BuildSettingsTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Settings/BuildSettingsTests.swift @@ -2,7 +2,7 @@ import Path import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct BuildSettingsTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Settings/ConfigurationMatcherTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Settings/ConfigurationMatcherTests.swift similarity index 98% rename from Tests/XcodeProjMapperTests/MapperTests/Settings/ConfigurationMatcherTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Settings/ConfigurationMatcherTests.swift index 431f4289..eca98ae9 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Settings/ConfigurationMatcherTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Settings/ConfigurationMatcherTests.swift @@ -1,6 +1,6 @@ import Testing import XcodeGraph -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct ConfigurationMatcherTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Settings/XCConfigurationMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Settings/XCConfigurationMapperTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Settings/XCConfigurationMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Settings/XCConfigurationMapperTests.swift index 8466ad1a..82b2f832 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Settings/XCConfigurationMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Settings/XCConfigurationMapperTests.swift @@ -2,7 +2,7 @@ import Path import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct XCConfigurationMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Target/PBXBuildRuleMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Target/PBXBuildRuleMapperTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Target/PBXBuildRuleMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Target/PBXBuildRuleMapperTests.swift index 963d4658..b93c8eb4 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Target/PBXBuildRuleMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Target/PBXBuildRuleMapperTests.swift @@ -1,7 +1,7 @@ import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXBuildRuleMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Target/PBXTargetDependencyMapper.swift b/Tests/XcodeGraphMapperTests/MapperTests/Target/PBXTargetDependencyMapper.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Target/PBXTargetDependencyMapper.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Target/PBXTargetDependencyMapper.swift index 341dc80d..0aba6df6 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Target/PBXTargetDependencyMapper.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Target/PBXTargetDependencyMapper.swift @@ -2,7 +2,7 @@ import Path import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct DependencyMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Target/PBXTargetMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Target/PBXTargetMapperTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Target/PBXTargetMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Target/PBXTargetMapperTests.swift index 0d347aa5..c879b0ce 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Target/PBXTargetMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Target/PBXTargetMapperTests.swift @@ -4,7 +4,7 @@ import Path import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct PBXTargetMapperTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Target/TargetDependencyExtensionsTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Target/TargetDependencyExtensionsTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Target/TargetDependencyExtensionsTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Target/TargetDependencyExtensionsTests.swift index fdda04a3..b7a63b6a 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Target/TargetDependencyExtensionsTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Target/TargetDependencyExtensionsTests.swift @@ -3,7 +3,7 @@ import Testing import XcodeMetadata import XcodeProj @testable import XcodeGraph -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct TargetDependencyExtensionsTests { diff --git a/Tests/XcodeProjMapperTests/MapperTests/Workspace/XCWorkspaceMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Workspace/XCWorkspaceMapperTests.swift similarity index 99% rename from Tests/XcodeProjMapperTests/MapperTests/Workspace/XCWorkspaceMapperTests.swift rename to Tests/XcodeGraphMapperTests/MapperTests/Workspace/XCWorkspaceMapperTests.swift index f889f4d0..55cdfbe4 100644 --- a/Tests/XcodeProjMapperTests/MapperTests/Workspace/XCWorkspaceMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Workspace/XCWorkspaceMapperTests.swift @@ -4,7 +4,7 @@ import PathKit import Testing import XcodeGraph import XcodeProj -@testable import XcodeProjMapper +@testable import XcodeGraphMapper @Suite struct XCWorkspaceMapperTests { diff --git a/Tests/XcodeProjMapperTests/Mocks/AssertionsTesting.swift b/Tests/XcodeGraphMapperTests/Mocks/AssertionsTesting.swift similarity index 100% rename from Tests/XcodeProjMapperTests/Mocks/AssertionsTesting.swift rename to Tests/XcodeGraphMapperTests/Mocks/AssertionsTesting.swift diff --git a/Tests/XcodeProjMapperTests/Mocks/MockDefaults.swift b/Tests/XcodeGraphMapperTests/Mocks/MockDefaults.swift similarity index 100% rename from Tests/XcodeProjMapperTests/Mocks/MockDefaults.swift rename to Tests/XcodeGraphMapperTests/Mocks/MockDefaults.swift diff --git a/Tests/XcodeProjMapperTests/TestData/.swift b/Tests/XcodeGraphMapperTests/TestData/.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/.swift rename to Tests/XcodeGraphMapperTests/TestData/.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXBuildRule+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXBuildRule+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXBuildRule+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXBuildRule+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXFileReference+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXFileReference+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXFileReference+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXFileReference+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXGroup+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXGroup+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXGroup+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXGroup+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXNativeTarget+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXNativeTarget+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXNativeTarget+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXNativeTarget+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXProj+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXProj+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXProj+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXProj+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXProject+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXProject+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXProject+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXProject+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXShellScriptBuildPhase+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXShellScriptBuildPhase+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXShellScriptBuildPhase+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXShellScriptBuildPhase+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXTargetDependency+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXTargetDependency+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXTargetDependency+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXTargetDependency+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/PBXVariantGroup+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/PBXVariantGroup+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/PBXVariantGroup+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/PBXVariantGroup+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCBuildConfiguration+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCBuildConfiguration+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCBuildConfiguration+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCBuildConfiguration+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCConfigurationList+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCConfigurationList+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCConfigurationList+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCConfigurationList+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCScheme+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCScheme+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCScheme+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCScheme+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCSchemeTestableReference+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCSchemeTestableReference+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCSchemeTestableReference+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCSchemeTestableReference+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCUserData+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCUserData+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCUserData+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCUserData+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCVersionGroup+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCVersionGroup+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCVersionGroup+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCVersionGroup+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCWorkspace+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCWorkspace+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCWorkspace+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCWorkspace+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCWorkspaceDataElement+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCWorkspaceDataElement+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCWorkspaceDataElement+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCWorkspaceDataElement+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XCWorkspaceDataGroup+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XCWorkspaceDataGroup+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XCWorkspaceDataGroup+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XCWorkspaceDataGroup+TestData.swift diff --git a/Tests/XcodeProjMapperTests/TestData/XcodeProj+TestData.swift b/Tests/XcodeGraphMapperTests/TestData/XcodeProj+TestData.swift similarity index 100% rename from Tests/XcodeProjMapperTests/TestData/XcodeProj+TestData.swift rename to Tests/XcodeGraphMapperTests/TestData/XcodeProj+TestData.swift diff --git a/Tuist/ProjectDescriptionHelpers/Module.swift b/Tuist/ProjectDescriptionHelpers/Module.swift index 12a1e344..76e3187f 100644 --- a/Tuist/ProjectDescriptionHelpers/Module.swift +++ b/Tuist/ProjectDescriptionHelpers/Module.swift @@ -3,7 +3,7 @@ import ProjectDescription public enum Module: String, CaseIterable { case xcodeGraph = "XcodeGraph" - case xcodeProjMapper = "XcodeProjMapper" + case xcodeGraphMapper = "XcodeGraphMapper" case xcodeMetadata = "XcodeMetadata" public var isRunnable: Bool { @@ -80,14 +80,14 @@ public enum Module: String, CaseIterable { public var unitTestsTargetName: String? { switch self { - case .xcodeGraph, .xcodeProjMapper, .xcodeMetadata: + case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: return "\(rawValue)Tests" } } public var integrationTestsTargetName: String? { switch self { - case .xcodeGraph, .xcodeProjMapper, .xcodeMetadata: + case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: return nil } } @@ -125,7 +125,7 @@ public enum Module: String, CaseIterable { .external(name: "AnyCodable"), .external(name: "Path"), ] - case .xcodeProjMapper: + case .xcodeGraphMapper: [ .target(name: Module.xcodeGraph.rawValue), .target(name: Module.xcodeMetadata.rawValue), @@ -145,7 +145,7 @@ public enum Module: String, CaseIterable { public var unitTestDependencies: [TargetDependency] { var dependencies: [TargetDependency] = switch self { - case .xcodeGraph, .xcodeMetadata, .xcodeProjMapper: + case .xcodeGraph, .xcodeMetadata, .xcodeGraphMapper: [ ] } @@ -155,7 +155,7 @@ public enum Module: String, CaseIterable { public var testingDependencies: [TargetDependency] { let dependencies: [TargetDependency] = switch self { - case .xcodeGraph, .xcodeProjMapper, .xcodeMetadata: + case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: [ ] } @@ -164,7 +164,7 @@ public enum Module: String, CaseIterable { public var integrationTestsDependencies: [TargetDependency] { var dependencies: [TargetDependency] = switch self { - case .xcodeGraph, .xcodeProjMapper, .xcodeMetadata: + case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: [] } dependencies.append(.target(name: targetName)) @@ -184,7 +184,7 @@ public enum Module: String, CaseIterable { rootFolder = "Sources" } let resources: ResourceFileElements = switch self { - case .xcodeGraph, .xcodeProjMapper, .xcodeMetadata: + case .xcodeGraph, .xcodeGraphMapper, .xcodeMetadata: [] } var debugSettings: ProjectDescription.SettingsDictionary = ["SWIFT_ACTIVE_COMPILATION_CONDITIONS": "$(inherited) MOCKING"] From 2c932d374217ab36e94a6d686fd2f4e7b82f6e95 Mon Sep 17 00:00:00 2001 From: fortmarek Date: Wed, 5 Feb 2025 14:51:06 +0100 Subject: [PATCH 9/9] Lint code --- Package.swift | 10 +++++----- .../MapperTests/Schemes/XCSchemeMapperTests.swift | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index b823ba1d..8ce84f70 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let targets: [Target] = [ "Path", ], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency") + .enableExperimentalFeature("StrictConcurrency"), ] ), .target( @@ -29,7 +29,7 @@ let targets: [Target] = [ name: "XcodeMetadataTests", dependencies: ["XcodeMetadata", "XcodeGraph"], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency") + .enableExperimentalFeature("StrictConcurrency"), ] ), .target( @@ -42,14 +42,14 @@ let targets: [Target] = [ .product(name: "XcodeProj", package: "XcodeProj"), ], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency") + .enableExperimentalFeature("StrictConcurrency"), ] ), .testTarget( name: "XcodeGraphTests", dependencies: [.target(name: "XcodeGraph")], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency") + .enableExperimentalFeature("StrictConcurrency"), ] ), .testTarget( @@ -59,7 +59,7 @@ let targets: [Target] = [ .product(name: "FileSystem", package: "FileSystem"), ], swiftSettings: [ - .enableExperimentalFeature("StrictConcurrency") + .enableExperimentalFeature("StrictConcurrency"), ] ), ] diff --git a/Tests/XcodeGraphMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift b/Tests/XcodeGraphMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift index 82d404b1..600b8883 100644 --- a/Tests/XcodeGraphMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift +++ b/Tests/XcodeGraphMapperTests/MapperTests/Schemes/XCSchemeMapperTests.swift @@ -137,9 +137,11 @@ struct XCSchemeMapperTests { ) let runnable = XCScheme.BuildableProductRunnable(buildableReference: targetRef) let envVar = XCScheme.EnvironmentVariable( - variable: "RUN_ENV", value: "run_value", enabled: true) + variable: "RUN_ENV", value: "run_value", enabled: true + ) let launchArg = XCScheme.CommandLineArguments.CommandLineArgument( - name: "run_arg", enabled: true) + name: "run_arg", enabled: true + ) let element = runnable.xmlElement() let launchAction = XCScheme.LaunchAction( runnable: try .init(element: element),