Move CI to Swift 5.9 / Xcode 15 beta

realm · Aug 7, 2023 · b00a6cc · b00a6cc
1 parent 7e7790d
commit b00a6cc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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