Merge pull request #3169 from square/bquenaudon.2024-11-08.swift

Fixing swift
square · Nov 8, 2024 · 0297ce6 · 0297ce6
2 parents 2f9991c + b1b2ec5
commit 0297ce6
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 15.4.0
+          xcode-version: latest-stable
 
       # We set `SDKROOT` as a workaround for https://github.com/gradle/gradle/pull/29227
       - name: Check test files
@@ -129,7 +129,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 15.4.0
+          xcode-version: latest-stable
 
       # We set `SDKROOT` as a workaround for https://github.com/gradle/gradle/pull/29227
       - name: Test Swift Runtime
@@ -206,7 +206,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 15.4.0
+          xcode-version: latest-stable
 
       # We set `SDKROOT` as a workaround for https://github.com/gradle/gradle/pull/29227
       - name: Upload Artifacts

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 15.4.0
+          xcode-version: latest-stable
 
       # We set `SDKROOT` as a workaround for https://github.com/gradle/gradle/pull/29227
       - name: Upload Artifacts
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 15.4.0
+          xcode-version: latest-stable
 
       - name: Set up Python
         uses: actions/setup-python@v5

diff --git a/wire-runtime-swift/build.gradle.kts b/wire-runtime-swift/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 }
 
 library {
+  sourceCompatibility = SwiftVersion.SWIFT5
   module.set("Wire")
 }
 

diff --git a/wire-tests-proto3-swift/build.gradle.kts b/wire-tests-proto3-swift/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 library {
+  sourceCompatibility = SwiftVersion.SWIFT5
   dependencies {
     api(projects.wireRuntimeSwift)
   }

diff --git a/wire-tests-swift/manifest/module_one/build.gradle.kts b/wire-tests-swift/manifest/module_one/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 library {
+  sourceCompatibility = SwiftVersion.SWIFT5
   dependencies {
     api(projects.wireRuntimeSwift)
   }

diff --git a/wire-tests-swift/manifest/module_three/build.gradle.kts b/wire-tests-swift/manifest/module_three/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 library {
+  sourceCompatibility = SwiftVersion.SWIFT5
   dependencies {
     api(projects.wireRuntimeSwift)
     implementation(projects.wireTestsSwift.manifest.moduleOne)

diff --git a/wire-tests-swift/manifest/module_two/build.gradle.kts b/wire-tests-swift/manifest/module_two/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 library {
+  sourceCompatibility = SwiftVersion.SWIFT5
   dependencies {
     api(projects.wireRuntimeSwift)
     implementation(projects.wireTestsSwift.manifest.moduleOne)

diff --git a/wire-tests-swift/no-manifest/build.gradle.kts b/wire-tests-swift/no-manifest/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 library {
+  sourceCompatibility = SwiftVersion.SWIFT5
   dependencies {
     api(projects.wireRuntimeSwift)
   }