From b00a6cc9d60a3413b94c97ae97c77ea0787cfd88 Mon Sep 17 00:00:00 2001 From: John Fairhurst Date: Sun, 25 Jun 2023 09:40:00 +0100 Subject: [PATCH] Move CI to Swift 5.9 / Xcode 15 beta --- .github/workflows/Tests.yml | 2 +- spec/integration_spec.rb | 8 ++++++-- spec/integration_specs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index eb51a0360..cbddb387a 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -31,7 +31,7 @@ jobs: matrix: spec: ["objc_spec", "swift_spec", "cocoapods_spec"] env: - DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer steps: - uses: actions/checkout@v3 with: diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb index 30ff32aae..299d3d170 100644 --- a/spec/integration_spec.rb +++ b/spec/integration_spec.rb @@ -251,13 +251,17 @@ def configure_cocoapods describe 'jazzy cocoapods' do # Xcode 14.3 workaround, special podspec podspec_patch = ROOT + 'spec/Moya.podspec' - podspec_path = ROOT + 'spec/integration_specs/document_moya_podspec/before' - FileUtils.cp_r podspec_patch, podspec_path, remove_destination: true + podspec_used = ROOT + 'spec/integration_specs/document_moya_podspec/before/Moya.podspec' + podspec_save = ROOT + 'spec/Moya.podspec.safe' + FileUtils.cp_r podspec_used, podspec_save, remove_destination: true + FileUtils.cp_r podspec_patch, podspec_used, remove_destination: true configure_cocoapods describe 'Creates docs for a podspec with dependencies and subspecs' do behaves_like cli_spec 'document_moya_podspec', '--podspec=Moya.podspec' end + FileUtils.cp_r podspec_save, podspec_used, remove_destination: true + FileUtils.rm_rf podspec_save end if !spec_subset || spec_subset == 'cocoapods' # rubocop:enable Style/MultilineIfModifier diff --git a/spec/integration_specs b/spec/integration_specs index d7917ca62..c93ac7099 160000 --- a/spec/integration_specs +++ b/spec/integration_specs @@ -1 +1 @@ -Subproject commit d7917ca625bf29f158e6f0f5dfd6e392fd7e9f84 +Subproject commit c93ac70995efdc651cd93e2f0d9f39d67af9538d