Remove CF bridges

Standardize newline handling (#522 )
* Standardize newline handling * Fix some unterminated bolds in other languages * Set language back
2026-04-09 18:57:22 +02:00 · 2024-02-13 21:15:20 -08:00 · 2024-01-25 02:14:34 +00:00 · 2024-01-23 00:58:36 +00:00 · 2024-01-18 17:35:36 +00:00 · 2024-01-17 19:28:29 +00:00
9 changed files with 1829 additions and 40 deletions
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -5,8 +5,8 @@ on:
    - cron: "0 8 * * *"
 jobs:
  build:
-#     runs-on: macOS-latest
-    runs-on: macos-13
+#     runs-on: macOS-latest-xlarge
+    runs-on: macos-13-xlarge
    timeout-minutes: 10
    steps:
    - uses: actions/checkout@v4
@@ -20,7 +20,7 @@ jobs:
        APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
      run: ./.github/scripts/signing.sh
    - name: Set Environment
-      run: sudo xcrun xcode-select -s /Applications/Xcode_15.1.app
+      run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app
    - name: Update Build Number
      env:
        RUN_ID: ${{ github.run_id }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,8 +6,8 @@ on:
      - '*'
 jobs:
  test:
-#     runs-on: macOS-latest
-    runs-on: macos-13
+#     runs-on: macOS-latest-xlarge
+    runs-on: macos-13-xlarge
    timeout-minutes: 10
    steps:
    - uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
        APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
      run: ./.github/scripts/signing.sh
    - name: Set Environment
-      run: sudo xcrun xcode-select -s /Applications/Xcode_15.1.app
+      run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app
    - name: Test
      run: |
            pushd Sources/Packages
@@ -43,7 +43,7 @@ jobs:
        APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
      run: ./.github/scripts/signing.sh
    - name: Set Environment
-      run: sudo xcrun xcode-select -s /Applications/Xcode_15.1.app
+      run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app
    - name: Update Build Number
      env:
        TAG_NAME: ${{ github.ref }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,13 +3,13 @@ name: Test
 on: [push, pull_request]
 jobs:
  test:
-#     runs-on: macOS-latest
-    runs-on: macos-13
+#     runs-on: macOS-latest-xlarge
+    runs-on: macos-13-xlarge
    timeout-minutes: 10
    steps:
    - uses: actions/checkout@v4
    - name: Set Environment
-      run: sudo xcrun xcode-select -s /Applications/Xcode_15.1.app
+      run: sudo xcrun xcode-select -s /Applications/Xcode_15.2.app
    - name: Test
      run: |
            pushd Sources/Packages
--- a/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveStore.swift
+++ b/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveStore.swift
@@ -75,7 +75,7 @@ extension SecureEnclave {
        public func delete(secret: Secret) throws {
            let deleteAttributes = KeychainDictionary([
                kSecClass: kSecClassKey,
-                kSecAttrApplicationLabel: secret.id as CFData
+                kSecAttrApplicationLabel: secret.id
            ])
            let status = SecItemDelete(deleteAttributes)
            if status != errSecSuccess {
@@ -87,7 +87,7 @@ extension SecureEnclave {
        public func update(secret: Secret, name: String) throws {
            let updateQuery = KeychainDictionary([
                kSecClass: kSecClassKey,
-                kSecAttrApplicationLabel: secret.id as CFData
+                kSecAttrApplicationLabel: secret.id
            ])

            let updatedAttributes = KeychainDictionary([
@@ -114,7 +114,7 @@ extension SecureEnclave {
            let attributes = KeychainDictionary([
                kSecClass: kSecClassKey,
                kSecAttrKeyClass: kSecAttrKeyClassPrivate,
-                kSecAttrApplicationLabel: secret.id as CFData,
+                kSecAttrApplicationLabel: secret.id,
                kSecAttrKeyType: Constants.keyType,
                kSecAttrTokenID: kSecAttrTokenIDSecureEnclave,
                kSecAttrApplicationTag: Constants.keyTag,
@@ -145,7 +145,7 @@ extension SecureEnclave {
            let attributes = KeychainDictionary([
                kSecClass: kSecClassKey,
                kSecAttrKeyClass: kSecAttrKeyClassPrivate,
-                kSecAttrApplicationLabel: secret.id as CFData,
+                kSecAttrApplicationLabel: secret.id,
                kSecAttrKeyType: Constants.keyType,
                kSecAttrTokenID: kSecAttrTokenIDSecureEnclave,
                kSecAttrApplicationTag: Constants.keyTag,
@@ -304,8 +304,8 @@ extension SecureEnclave.Store {
 extension SecureEnclave {

    enum Constants {
-        static let keyTag = "com.maxgoedjen.secretive.secureenclave.key".data(using: .utf8)! as CFData
-        static let keyType = kSecAttrKeyTypeECSECPrimeRandom
+        static let keyTag = Data("com.maxgoedjen.secretive.secureenclave.key".utf8)
+        static let keyType = kSecAttrKeyTypeECSECPrimeRandom as String
        static let unauthenticatedThreshold: TimeInterval = 0.05
    }

--- a/Sources/Packages/Sources/SmartCardSecretKit/SmartCardStore.swift
+++ b/Sources/Packages/Sources/SmartCardSecretKit/SmartCardStore.swift
@@ -55,7 +55,7 @@ extension SmartCard {
            let attributes = KeychainDictionary([
                kSecClass: kSecClassKey,
                kSecAttrKeyClass: kSecAttrKeyClassPrivate,
-                kSecAttrApplicationLabel: secret.id as CFData,
+                kSecAttrApplicationLabel: secret.id,
                kSecAttrTokenID: tokenID,
                kSecUseAuthenticationContext: context,
                kSecReturnRef: true
@@ -217,7 +217,7 @@ extension SmartCard.Store {
        let attributes = KeychainDictionary([
            kSecClass: kSecClassKey,
            kSecAttrKeyClass: kSecAttrKeyClassPrivate,
-            kSecAttrApplicationLabel: secret.id as CFData,
+            kSecAttrApplicationLabel: secret.id,
            kSecAttrTokenID: tokenID,
            kSecUseAuthenticationContext: context,
            kSecReturnRef: true
--- a/Sources/Secretive.xcodeproj/project.pbxproj
+++ b/Sources/Secretive.xcodeproj/project.pbxproj
@@ -429,7 +429,11 @@
 			knownRegions = (
 				en,
 				Base,
+				it,
 				fr,
+				de,
+				"pt-BR",
+				fi,
 			);
 			mainGroup = 50617D7623FCE48D0099B055;
 			productRefGroup = 50617D8023FCE48E0099B055 /* Products */;
@@ -608,13 +612,14 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-concurrency -Xfrontend -enable-actor-data-race-checks";
+				OTHER_SWIFT_FLAGS = "";
 				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_SWIFT_SYMBOLS = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Debug;
 		};
@@ -667,13 +672,14 @@
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
-				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-concurrency -Xfrontend -enable-actor-data-race-checks";
+				OTHER_SWIFT_FLAGS = "";
 				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_SWIFT_SYMBOLS = NO;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Release;
 		};
@@ -701,7 +707,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -730,7 +735,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Secretive - Host";
-				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -833,13 +837,14 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-concurrency -Xfrontend -enable-actor-data-race-checks";
+				OTHER_SWIFT_FLAGS = "";
 				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_SWIFT_SYMBOLS = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 			};
 			name = Test;
 		};
@@ -863,7 +868,6 @@
 				MARKETING_VERSION = 1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Test;
@@ -908,7 +912,6 @@
 				MARKETING_VERSION = 1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Test;
@@ -933,7 +936,6 @@
 				MARKETING_VERSION = 1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -960,7 +962,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Secretive - Secret Agent";
-				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
--- a/Sources/Secretive/Localizable.xcstrings
+++ b/Sources/Secretive/Localizable.xcstrings
--- a/Sources/Secretive/Views/SetupView.swift
+++ b/Sources/Secretive/Views/SetupView.swift
@@ -26,7 +26,7 @@ struct SetupView: View {
                }
            }
        }
-        .frame(idealWidth: 500, idealHeight: 500)
+        .frame(minWidth: 500, idealWidth: 500, minHeight: 500, idealHeight: 500)
    }


--- a/Sources/Secretive/Views/UpdateView.swift
+++ b/Sources/Secretive/Views/UpdateView.swift
@@ -42,16 +42,16 @@ struct UpdateDetailView<UpdaterType: Updater>: View {
            if let prefix = split.first {
                switch prefix {
                case "#":
-                    attributed = Text(unprefixed).font(.title) + Text("\n")
+                    attributed = Text(unprefixed).font(.title) + Text(verbatim: "\n")
                case "##":
-                    attributed = Text(unprefixed).font(.title2) + Text("\n")
+                    attributed = Text(unprefixed).font(.title2) + Text(verbatim: "\n")
                case "###":
-                    attributed = Text(unprefixed).font(.title3) + Text("\n")
+                    attributed = Text(unprefixed).font(.title3) + Text(verbatim: "\n")
                default:
-                    attributed = Text(line) + Text("\n\n")
+                    attributed = Text(line) + Text(verbatim: "\n\n")
                }
            } else {
-                attributed = Text(line) + Text("\n\n")
+                attributed = Text(line) + Text(verbatim: "\n\n")
            }
            text = text + attributed
        }
Author	SHA1	Message	Date
Max Goedjen	f72c509854	Remove CF bridges	2024-02-13 21:15:20 -08:00
Max Goedjen	6f4226f97a	Standardize newline handling (#522 ) * Standardize newline handling * Fix some unterminated bolds in other languages * Set language back	2024-01-25 02:14:34 +00:00
Aarni Koskela	3315a4bfbc	Add Finnish localization (#521 )	2024-01-23 00:58:36 +00:00
Riccardo Pesciarelli	85a7a64bc9	Updated Italian localization strings (#520 ) * 🇮🇹 Initial proposal for Italian localization * 🇮🇹 Updated Italian localization --------- Co-authored-by: Max Goedjen <max.goedjen@gmail.com>	2024-01-18 17:35:36 +00:00
Max Goedjen	409efa5f9f	Use Apple Silicon runners (#519 ) * Test running on XL (does this work for OSS projects?) * Move over test/release	2024-01-17 19:28:29 +00:00
Max Goedjen	bb63ae8469	Set min width/height for setup. (#518 )	2024-01-17 04:08:48 +00:00
Max Goedjen	30c1d36974	Mark newlines as verbatim (#517 ) * Merge * Add missing key	2024-01-17 03:49:14 +00:00
Max Goedjen	de8d18f9e9	Switch to Xcode 15.2 (#516 )	2024-01-16 21:39:07 +00:00
Riccardo Pesciarelli	1ae0996e2c	🇮🇹 Initial proposal for Italian localization (#512 ) Co-authored-by: Max Goedjen <max.goedjen@gmail.com>	2024-01-16 21:35:28 +00:00
Moritz Sternemann	3d50a99430	Add German Localization 🇩🇪 (#514 ) * Add German localization * Small adjustments * Add German localization in project file --------- Co-authored-by: Max Goedjen <max.goedjen@gmail.com>	2024-01-16 21:15:07 +00:00
Marcio Saeger	45fc356f0f	Add PT-BR to the i18n (#515 )	2024-01-16 21:12:46 +00:00