From 6dbb3b7fb3efb8dba0cc93d352e3bd2c841da4a5 Mon Sep 17 00:00:00 2001
From: Max Goedjen <max.goedjen@gmail.com>
Date: Sun, 5 Apr 2020 16:05:45 -0700
Subject: [PATCH 1/2] Add back Xcode 11.4 changes (#87)
---
.github/workflows/release.yml | 2 ++
.github/workflows/test.yml | 2 ++
SecretAgentKit/Agent.swift | 4 +---
Secretive/Views/ContentView.swift | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index be94bad..4522a2e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,6 +17,8 @@ jobs:
HOST_PROFILE_DATA: ${{ secrets.HOST_PROFILE_DATA }}
AGENT_PROFILE_DATA: ${{ secrets.AGENT_PROFILE_DATA }}
run: ./.github/scripts/signing.sh
+ - name: Set Environment
+ run: sudo xcrun xcode-select -s /Applications/Xcode_11.4.app
- name: Test
run: xcrun xcodebuild test -project Secretive.xcodeproj -scheme Secretive
build:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3c08203..7e686c3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,5 +14,7 @@ jobs:
HOST_PROFILE_DATA: ${{ secrets.HOST_PROFILE_DATA }}
AGENT_PROFILE_DATA: ${{ secrets.AGENT_PROFILE_DATA }}
run: ./.github/scripts/signing.sh
+ - name: Set Environment
+ run: sudo xcrun xcode-select -s /Applications/Xcode_11.4.app
- name: Test
run: xcrun xcodebuild test -project Secretive.xcodeproj -scheme Secretive
diff --git a/SecretAgentKit/Agent.swift b/SecretAgentKit/Agent.swift
index 6ba1d32..9c9a789 100644
--- a/SecretAgentKit/Agent.swift
+++ b/SecretAgentKit/Agent.swift
@@ -65,9 +65,7 @@ extension Agent {
extension Agent {
func identities() -> Data {
- // TODO: RESTORE ONCE XCODE 11.4 IS GM
- let secrets = storeList.stores.flatMap { $0.secrets }
-// let secrets = storeList.stores.flatMap(\.secrets)
+ let secrets = storeList.stores.flatMap(\.secrets)
var count = UInt32(secrets.count).bigEndian
let countData = Data(bytes: &count, count: UInt32.bitWidth/8)
var keyData = Data()
diff --git a/Secretive/Views/ContentView.swift b/Secretive/Views/ContentView.swift
index 7ce9325..31b5bf7 100644
--- a/Secretive/Views/ContentView.swift
+++ b/Secretive/Views/ContentView.swift
@@ -110,7 +110,7 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
} else {
fallback = Constants.emptyStoreTag
}
- return self.storeList.stores.compactMap { $0.secrets.first }.first?.id ?? fallback
+ return self.storeList.stores.compactMap(\.secrets.first).first?.id ?? fallback
}
}
From bc0a45366ae055b12c96aa588cf7b11c81f19801 Mon Sep 17 00:00:00 2001
From: Max Goedjen <max.goedjen@gmail.com>
Date: Mon, 6 Apr 2020 21:32:22 -0700
Subject: [PATCH 2/2] Fix typo (#89)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 52a07fe..0a24778 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ While Secretive uses the Secure Enclave for key storage, it still relies on Keyc
### Backups and Transfers to New Machines
-Beacuse secrets in the Secure Enclave are not exportable, they are not able to be backed up, and you will not be able to transfer them to a new machine. If you get a new Mac, just create a new set of secrets specific to that Mac.
+Because secrets in the Secure Enclave are not exportable, they are not able to be backed up, and you will not be able to transfer them to a new machine. If you get a new Mac, just create a new set of secrets specific to that Mac.
## Security