From 1fcc4fc3bce568945a3c99db815087de05833c96 Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Fri, 23 Jun 2023 13:01:25 -0700 Subject: [PATCH 1/5] Update CI to check for Xcode 14 build errors --- .github/workflows/build-and-test.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index fbcac0e..3fc03a8 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -23,6 +23,13 @@ jobs: artifactname: SpeziContact.xcresult runsonlabels: '["macOS", "self-hosted"]' scheme: SpeziContact + build: + name: Build Swift Package on Xcode 14 + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + with: + artifactname: SpeziContact_Xcode14.xcresult + runsonlabels: '["macos-13"]' + scheme: SpeziContact buildandtestuitests: name: Build and Test UI Tests uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 @@ -36,4 +43,4 @@ jobs: needs: [buildandtest, buildandtestuitests] uses: StanfordSpezi/.github/.github/workflows/create-and-upload-coverage-report.yml@v2 with: - coveragereports: SpeziContact.xcresult TestApp.xcresult + coveragereports: SpeziContact.xcresult SpeziContact_Xcode14.xcresult TestApp.xcresult From e2d3980c6fafc92ec701cb2244b695c8ddb10166 Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Fri, 23 Jun 2023 13:19:26 -0700 Subject: [PATCH 2/5] Update Views --- .../Contact Views/ContactCard.swift | 12 +++--------- .../Contact Views/ContactView.swift | 18 ++++-------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/Sources/SpeziContact/Contact Views/ContactCard.swift b/Sources/SpeziContact/Contact Views/ContactCard.swift index e074738..db162d3 100644 --- a/Sources/SpeziContact/Contact Views/ContactCard.swift +++ b/Sources/SpeziContact/Contact Views/ContactCard.swift @@ -18,15 +18,9 @@ struct ContactCard: View { ContactView(contact: contact) .padding() .background { - if #available(iOS 17.0, *) { - RoundedRectangle(cornerRadius: 10) - .foregroundStyle(.background) - .shadow(radius: 5) - } else { - RoundedRectangle(cornerRadius: 10) - .foregroundColor(Color(.systemBackground)) - .shadow(radius: 5) - } + RoundedRectangle(cornerRadius: 10) + .foregroundStyle(.background) + .shadow(radius: 5) } } diff --git a/Sources/SpeziContact/Contact Views/ContactView.swift b/Sources/SpeziContact/Contact Views/ContactView.swift index 8c9a928..2b8cd78 100644 --- a/Sources/SpeziContact/Contact Views/ContactView.swift +++ b/Sources/SpeziContact/Contact Views/ContactView.swift @@ -105,13 +105,8 @@ public struct ContactView: View { if let address = contact.address { Button(action: openMaps) { ZStack { - if #available(iOS 17.0, *) { - RoundedRectangle(cornerRadius: 10) - .foregroundStyle(.background.secondary) - } else { - RoundedRectangle(cornerRadius: 10) - .foregroundColor(Color(.systemGroupedBackground)) - } + RoundedRectangle(cornerRadius: 10) + .foregroundStyle(Color(uiColor: .secondarySystemBackground)) HStack(alignment: .top) { VStack(alignment: .leading, spacing: 4) { Text("CONTACT_ADDRESS", bundle: .module) @@ -145,13 +140,8 @@ public struct ContactView: View { private func contactButton(_ contactOption: ContactOption) -> some View { Button(action: contactOption.action) { ZStack { - if #available(iOS 17.0, *) { - RoundedRectangle(cornerRadius: 10) - .foregroundStyle(.background.secondary) - } else { - RoundedRectangle(cornerRadius: 10) - .foregroundColor(Color(.systemGroupedBackground)) - } + RoundedRectangle(cornerRadius: 10) + .foregroundStyle(Color(uiColor: .secondarySystemBackground)) VStack(spacing: 8) { contactOption.image .font(.title3) From ba0e109dfb8562650fd9aa274d611bbf507f4f06 Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Fri, 23 Jun 2023 13:20:40 -0700 Subject: [PATCH 3/5] Update CI --- .github/workflows/build-and-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 3fc03a8..5b68a69 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -27,7 +27,6 @@ jobs: name: Build Swift Package on Xcode 14 uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 with: - artifactname: SpeziContact_Xcode14.xcresult runsonlabels: '["macos-13"]' scheme: SpeziContact buildandtestuitests: @@ -43,4 +42,4 @@ jobs: needs: [buildandtest, buildandtestuitests] uses: StanfordSpezi/.github/.github/workflows/create-and-upload-coverage-report.yml@v2 with: - coveragereports: SpeziContact.xcresult SpeziContact_Xcode14.xcresult TestApp.xcresult + coveragereports: SpeziContact.xcresult TestApp.xcresult From f24d8c051c502167e80fe8d7d8bc9b0b78809135 Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Fri, 23 Jun 2023 13:53:14 -0700 Subject: [PATCH 4/5] Update CI --- .github/workflows/build-and-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5b68a69..e1cfaa9 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -18,20 +18,20 @@ on: jobs: buildandtest: name: Build and Test Swift Package - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@artifactUpload with: artifactname: SpeziContact.xcresult runsonlabels: '["macOS", "self-hosted"]' scheme: SpeziContact build: name: Build Swift Package on Xcode 14 - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@artifactUpload with: runsonlabels: '["macos-13"]' scheme: SpeziContact buildandtestuitests: name: Build and Test UI Tests - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@artifactUpload with: artifactname: TestApp.xcresult runsonlabels: '["macOS", "self-hosted"]' @@ -40,6 +40,6 @@ jobs: uploadcoveragereport: name: Upload Coverage Report needs: [buildandtest, buildandtestuitests] - uses: StanfordSpezi/.github/.github/workflows/create-and-upload-coverage-report.yml@v2 + uses: StanfordSpezi/.github/.github/workflows/create-and-upload-coverage-report.yml@artifactUpload with: coveragereports: SpeziContact.xcresult TestApp.xcresult From 697e1c00ede4c0dc7089c4460bd733f90f1b2bae Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Fri, 23 Jun 2023 14:02:08 -0700 Subject: [PATCH 5/5] Update CI --- .github/workflows/build-and-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e1cfaa9..5b68a69 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -18,20 +18,20 @@ on: jobs: buildandtest: name: Build and Test Swift Package - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@artifactUpload + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 with: artifactname: SpeziContact.xcresult runsonlabels: '["macOS", "self-hosted"]' scheme: SpeziContact build: name: Build Swift Package on Xcode 14 - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@artifactUpload + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 with: runsonlabels: '["macos-13"]' scheme: SpeziContact buildandtestuitests: name: Build and Test UI Tests - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@artifactUpload + uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 with: artifactname: TestApp.xcresult runsonlabels: '["macOS", "self-hosted"]' @@ -40,6 +40,6 @@ jobs: uploadcoveragereport: name: Upload Coverage Report needs: [buildandtest, buildandtestuitests] - uses: StanfordSpezi/.github/.github/workflows/create-and-upload-coverage-report.yml@artifactUpload + uses: StanfordSpezi/.github/.github/workflows/create-and-upload-coverage-report.yml@v2 with: coveragereports: SpeziContact.xcresult TestApp.xcresult