Update For Building for Xcode 14 & Improve CI (#9)

StanfordSpezi · Jun 23, 2023 · 03034b8 · 03034b8
1 parent 287bfbc
commit 03034b8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -23,6 +23,12 @@ 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:
+      runsonlabels: '["macos-13"]'
+      scheme: SpeziContact
   buildandtestuitests:
     name: Build and Test UI Tests
     uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2

diff --git 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
@@ -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)