Field Merging [3/x] Implement in SelectionSetTemplate

.editorconfig

@@ -0,0 +1,8 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/actions/create-pr/action.yml

@@ -0,0 +1,33 @@
+name: "Create Pull Request"
+description: "Creates a pull request with the given parameters."
+inputs:
+  access-token:
+    description: "The Personal Access Token with proper permissions to the given repository."
+    required: true
+  repo:
+    description: "The name of the repository to create the PR in."
+    required: true
+  base-branch:
+    description: "The target branch for the pull request"
+    required: true
+    default: "main"
+  head-branch:
+    description: "The branch containing the commits for your pull request."
+    required: true
+  reviewers:
+    description: "The reviewers to add to the pull request."
+  title:
+    description: "The title for the pull request."
+    required: true
+  body:
+    description: "The body information for the pull request."
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Repository Dispatch
+      shell: bash
+      run: |
+        gh pr create --repo "${{ inputs.repo }}" --base "${{ inputs.base-branch }}" --head "${{ inputs.head-branch }}" --reviewer "${{ inputs.reviewers }}" --title "${{ inputs.title }}" --body "${{ inputs.body }}"
+      env:
+        GH_TOKEN: ${{ inputs.access-token }}

.github/actions/run-cocoapods-integration-tests/action.yml

@@ -12,7 +12,7 @@ runs:
     shell: bash
     working-directory: Tests/CodegenCLITests/pod-install-test/
     run: |
-      ./Pods/Apollo/apollo-ios-cli init --schema-name NewTestSchema --module-type other
+      ./Pods/Apollo/apollo-ios-cli init --schema-namespace NewTestSchema --module-type other
   - name: CocoaPods - CLI Test (generate)
     shell: bash
     working-directory: Tests/CodegenCLITests/pod-install-test/

.github/actions/subtree-split-push/action.yml

@@ -21,10 +21,12 @@ runs:
   steps:
   - name: Split and Push ${{ inputs.subtree }}
     shell: bash
+    env:
+      PR_TITLE: ${{ inputs.pr-title }}
     run: |
       git fetch ${{ inputs.remote }} ${{ inputs.target-branch }}
-      sh git-subtree.sh pull -P ${{ inputs.subtree }} --squash -m "pull: ${{ inputs.subtree }} - PR #${{ inputs.pr-number }} - ${{ inputs.pr-title }}" ${{ inputs.remote }} ${{ inputs.target-branch }} 
-      splitResult=$(sh git-subtree.sh -P ${{ inputs.subtree }} split --squash --rejoin -m "split: ${{ inputs.subtree }} - PR #${{ inputs.pr-number }} - ${{ inputs.pr-title }}")
+      sh git-subtree.sh pull -P ${{ inputs.subtree }} --squash -m "pull: ${{ inputs.subtree }} - PR #${{ inputs.pr-number }} - $PR_TITLE" ${{ inputs.remote }} ${{ inputs.target-branch }} 
+      splitResult=$(sh git-subtree.sh -P ${{ inputs.subtree }} split --squash --rejoin -m "split: ${{ inputs.subtree }} - PR #${{ inputs.pr-number }} - $PR_TITLE")
       if [ ! -z "$splitResult" ]
       then
         sh git-subtree.sh push -P ${{ inputs.subtree }} ${{ inputs.remote }} ${{ inputs.target-branch }}

.github/workflows/ci-tests-xcode-beta.yml

@@ -0,0 +1,250 @@
+name: "CI Tests (Xcode 16.0 Beta)"
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+env:
+  XCODE_VERSION: "16.0-beta"
+
+jobs:
+  changes:
+    runs-on: ubuntu-latest
+    outputs:
+      ios: ${{ steps.filter.outputs.ios }}
+      codegen: ${{ steps.filter.outputs.codegen }}
+      pagination: ${{ steps.filter.outputs.pagination }}
+      tuist: ${{ steps.filter.outputs.tuist }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            ios:
+              - 'apollo-ios/**'
+              - 'Tests/ApolloInternalTestHelpers/**'
+              - 'Tests/ApolloServerIntegrationTests/**'
+              - 'Tests/ApolloTests/**'
+            codegen:
+              - 'apollo-ios-codegen/**'
+              - 'Tests/ApolloCodegenInternalTestHelpers/**'
+              - 'Tests/ApolloCodegenTests/**'
+              - 'Tests/CodegenCLITests/**'
+              - 'Tests/CodegenIntegrationTests/**'
+              - 'Tests/TestCodeGenConfigurations/**'
+            pagination:
+              - 'apollo-ios-pagination/**'
+              - 'Tests/ApolloInternalTestHelpers/**'
+              - 'apollo-ios/**'
+            tuist:
+              - '.tuist-version'
+
+  tuist-generation:
+    runs-on: macos-latest
+    needs: [changes]
+    if: ${{ needs.changes.outputs.ios == 'true' || needs.changes.outputs.codegen  == 'true' || needs.changes.outputs.pagination  == 'true' || needs.changes.outputs.tuist == 'true' }}
+    timeout-minutes: 8
+    name: Run Tuist Generation
+    steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: ${{ env.XCODE_VERSION }}
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+    - name: Run Tuist Generation
+      uses: ./.github/actions/run-tuist-generation
+    - name: Cache Build Dependencies
+      uses: actions/cache@v3
+      with:
+        path: |
+          ./ApolloDev.xcodeproj
+          ./ApolloDev.xcworkspace
+          ./Derived/*
+        key: ${{ github.run_id }}-dependencies
+
+  run-swift-builds:
+    runs-on: macos-latest
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - package: apollo-ios
+          - package: apollo-ios-codegen
+          - package: apollo-ios-pagination
+    name: Run swift build for SPM packages
+    steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: ${{ env.XCODE_VERSION }}
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+    - name: Run Swift Build
+      shell: bash
+      run: |
+        cd ${{ matrix.package }} && swift build
+
+  # build-and-unit-test:
+  #   runs-on: macos-latest
+  #   needs: [tuist-generation, changes]
+  #   timeout-minutes: 20
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       include:
+  #         # macOS_current
+  #         - destination: platform=macOS,arch=x86_64
+  #           scheme: ApolloTests
+  #           test-plan: Apollo-CITestPlan
+  #           name: Apollo Unit Tests - macOS
+  #           run-js-tests: false
+  #           should-run: ${{ needs.changes.outputs.ios }}
+  #         # Codegen CLI Test
+  #         - destination: platform=macOS,arch=x86_64
+  #           scheme: CodegenCLITests
+  #           test-plan: CodegenCLITestPlan
+  #           name: Codegen CLI Unit Tests - macOS
+  #           run-js-tests: false
+  #           should-run: ${{ needs.changes.outputs.codegen }}
+  #         # CodegenLib Test
+  #         - destination: platform=macOS,arch=x86_64
+  #           scheme: ApolloCodegenTests
+  #           test-plan: Apollo-Codegen-CITestPlan
+  #           name: Codegen Lib Unit Tests - macOS
+  #           run-js-tests: true
+  #           should-run: ${{ needs.changes.outputs.codegen }}
+  #         # ApolloPagination Tests
+  #         - destination: platform=macOS,arch=x86_64
+  #           scheme: ApolloPaginationTests
+  #           test-plan: Apollo-PaginationTestPlan
+  #           name: ApolloPagination Unit Tests - macOS
+  #           run-js-tests: false
+  #           should-run: ${{ needs.changes.outputs.pagination }}
+  #   name: ${{ matrix.name }}
+  #   steps:
+  #   - uses: maxim-lobanov/setup-xcode@v1
+  #     with:
+  #       xcode-version: ${{ env.XCODE_VERSION }}
+  #   - name: Checkout Repo
+  #     uses: actions/checkout@v3
+  #   - name: Retrieve Build Cache
+  #     uses: actions/cache@v3
+  #     with:
+  #       path: |
+  #         ./ApolloDev.xcodeproj
+  #         ./ApolloDev.xcworkspace
+  #         ./Derived/*
+  #       key: ${{ github.run_id }}-dependencies
+  #       fail-on-cache-miss: true
+  #   # Caching for apollo-ios and apollo-ios-codegen SPM dependencies
+  #   # - uses: actions/cache@v3
+  #   #   with:
+  #   #     path: ./DerivedData/SourcePackages
+  #   #     key: ${{ runner.os }}-spm-${{ hashFiles('./apollo-ios/Package.resolved') }}-${{ hashFiles('./apollo-ios-codegen/Package.resolved') }}
+  #   # - name: Run Tuist Generation
+  #   #   uses: tuist/[email protected]
+  #   #   with:
+  #   #       command: 'generate'
+  #   #       arguments: ''
+  #   - name: Build and Test
+  #     if: ${{ matrix.should-run == true || matrix.should-run == 'true' }}
+  #     id: build-and-test
+  #     uses: ./.github/actions/build-and-run-unit-tests
+  #     with:
+  #       destination: ${{ matrix.destination }}
+  #       scheme: ${{ matrix.scheme }}
+  #       test-plan: ${{ matrix.test-plan }}
+  #   - name: Run-JS-Tests
+  #     if: ${{ matrix.run-js-tests == true }}
+  #     shell: bash
+  #     working-directory: apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/
+  #     run: |
+  #       npm install && npm test
+  #   - name: Save xcodebuild logs
+  #     if: ${{ steps.build-and-test.outcome != 'skipped' }}
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: ${{ matrix.name }}-logs
+  #       path: |
+  #         DerivedData/Logs/Build
+  #   - name: Save crash logs
+  #     if: ${{ steps.build-and-test.outcome != 'skipped' }}
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: ${{ matrix.name }}-crashes
+  #       path: |
+  #         ~/Library/Logs/DiagnosticReports
+  #   - name: Zip Result Bundle
+  #     if: ${{ steps.build-and-test.outcome != 'skipped' }}
+  #     shell: bash
+  #     working-directory: TestResults
+  #     run: |
+  #       zip -r ResultBundle.zip ResultBundle.xcresult
+  #   - name: Save test results
+  #     if: ${{ steps.build-and-test.outcome != 'skipped' }}
+  #     uses: actions/upload-artifact@v3
+  #     with:
+  #       name: ${{ matrix.name }}-results
+  #       path: |
+  #         TestResults/ResultBundle.zip
+
+  # CodegenTestConfigurations removed because source is not compatible with Sendable yet.
+
+  verify-frontend-bundle-latest:
+    runs-on: macos-latest
+    needs: [changes]
+    if: ${{ needs.changes.outputs.codegen  == 'true' }}
+    timeout-minutes: 5
+    name: Verify Frontend Bundle Latest - macOS
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+    - name: Build JS Bundle
+      shell: bash
+      working-directory: apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript
+      run: npm install && ./auto_rollup.sh
+    - name: Verify Latest
+      shell: bash
+      run: |
+        git diff --exit-code
+
+  verify-cli-binary-archive:
+    runs-on: macos-latest
+    needs: [changes]
+    if: ${{ needs.changes.outputs.codegen  == 'true' }}
+    timeout-minutes: 5
+    name: Verify CLI Binary Archive - macOS
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+    - name: Extract CLI Binary
+      shell: bash
+      working-directory: apollo-ios/CLI
+      run: tar -xf apollo-ios-cli.tar.gz apollo-ios-cli
+    - name: Verify Version
+      shell: bash
+      working-directory: apollo-ios/scripts
+      run: ./cli-version-check.sh
+
+  run-cocoapods-integration-tests:
+    runs-on: macos-latest
+    timeout-minutes: 20
+    name: Cocoapods Integration Tests - macOS
+    steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: ${{ env.XCODE_VERSION }}
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+    - name: Export ENV Variables
+      shell: bash
+      working-directory: apollo-ios
+      run: |
+        apollo_ios_sha=$(git rev-parse HEAD)
+        echo "APOLLO_IOS_SHA=$apollo_ios_sha" >> ${GITHUB_ENV}
+    - name: Run CocoaPods Integration Tests
+      id: run-cocoapods-integration-tests
+      uses: ./.github/actions/run-cocoapods-integration-tests
+
+  # IntegrationTests removed because source is not compatible with Sendable yet.