From b1b2ec5f3fc0bf0cd9a247058db20d497db23069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Quenaudon?= Date: Fri, 8 Nov 2024 12:21:11 +0000 Subject: [PATCH] Fixing swift --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- wire-runtime-swift/build.gradle.kts | 1 + wire-tests-proto3-swift/build.gradle.kts | 1 + wire-tests-swift/manifest/module_one/build.gradle.kts | 1 + wire-tests-swift/manifest/module_three/build.gradle.kts | 1 + wire-tests-swift/manifest/module_two/build.gradle.kts | 1 + wire-tests-swift/no-manifest/build.gradle.kts | 1 + 8 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95c6b4e803..ef1bada6cd 100644 --- 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 index c82e955d82..c7a34e9570 100644 --- 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 index 6eabfbea34..cc01ee614c 100644 --- 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 index 5c683740bc..33b9829eb3 100644 --- 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 index bcc586350d..4264a691cd 100644 --- 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 index d10a7368f3..9f0a6a64a2 100644 --- 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 index f2ca80a0fb..63291756b9 100644 --- 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 index e0d24f438e..0fba03312e 100644 --- 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) }