Compare commits
11 Commits
562023519a
...
v26.0.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db1f15f981 | ||
|
|
db58a5c048 | ||
|
|
00978b096b | ||
|
|
73d81216bb | ||
|
|
0f1c876520 | ||
|
|
2b3850440f | ||
|
|
756695c5b0 | ||
|
|
726df91d2d | ||
|
|
f6c4773ac7 | ||
|
|
f1367287de | ||
|
|
6b8d458605 |
4
.gitignore
vendored
@@ -1,3 +1,7 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
xcuserdata/
|
xcuserdata/
|
||||||
DerivedData/
|
DerivedData/
|
||||||
|
build/
|
||||||
|
Build/
|
||||||
|
dist/
|
||||||
|
.signing.env
|
||||||
|
|||||||
@@ -1,51 +1,61 @@
|
|||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_16x16.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "16x16"
|
"size" : "16x16"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_16x16@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "16x16"
|
"size" : "16x16"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_32x32.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "32x32"
|
"size" : "32x32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_32x32@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "32x32"
|
"size" : "32x32"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_128x128.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "128x128"
|
"size" : "128x128"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_128x128@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "128x128"
|
"size" : "128x128"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_256x256.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "256x256"
|
"size" : "256x256"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_256x256@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "256x256"
|
"size" : "256x256"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_512x512.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "1x",
|
"scale" : "1x",
|
||||||
"size" : "512x512"
|
"size" : "512x512"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "icon_512x512@2x.png",
|
||||||
"idiom" : "mac",
|
"idiom" : "mac",
|
||||||
"scale" : "2x",
|
"scale" : "2x",
|
||||||
"size" : "512x512"
|
"size" : "512x512"
|
||||||
|
|||||||
BIN
Assets.xcassets/AppIcon.appiconset/icon_128x128.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
Normal file
|
After Width: | Height: | Size: 55 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_16x16.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_256x256.png
Normal file
|
After Width: | Height: | Size: 55 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
Normal file
|
After Width: | Height: | Size: 230 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_32x32.png
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_512x512.png
Normal file
|
After Width: | Height: | Size: 230 KiB |
BIN
Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
Normal file
|
After Width: | Height: | Size: 1.0 MiB |
BIN
Assets/dmg_background.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
3
NOTES.md
@@ -3,5 +3,6 @@
|
|||||||
dynamic Data
|
dynamic Data
|
||||||
static Data
|
static Data
|
||||||
|
|
||||||
move source to /src. like iKeyMon before
|
|
||||||
add a merker for "reboot required"
|
add a merker for "reboot required"
|
||||||
|
Add dmg download option for macOS
|
||||||
|
Add versioning
|
||||||
|
|||||||
10
README.md
@@ -36,6 +36,16 @@ git clone https://git.24unix.net/tracer/iKeyMon
|
|||||||
cd iKeyMon
|
cd iKeyMon
|
||||||
open iKeyMon.xcodeproj
|
open iKeyMon.xcodeproj
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Local release build
|
||||||
|
|
||||||
|
Use the helper script to produce distributables in `dist/`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./scripts/build_release.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
It cleans previous artifacts, builds the `Release` configuration, and drops both `iKeyMon-<version>.zip` and `iKeyMon-<version>.dmg` into the `dist` folder (ignored by git). To enable codesigning + notarization, copy `signing.env.example` to `.signing.env`, fill in your Developer ID identity, Apple ID, team ID, and app-specific password. The script sources that file locally (it remains gitignored) and performs signing/notarization when the values are present.
|
||||||
## 📦 License
|
## 📦 License
|
||||||
|
|
||||||
MIT — see [LICENSE](LICENSE) for details.
|
MIT — see [LICENSE](LICENSE) for details.
|
||||||
|
|||||||
51
Sources/Extensions/View+Shimmer.swift
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct ShimmerModifier: ViewModifier {
|
||||||
|
var active: Bool
|
||||||
|
@State private var phase: CGFloat = -1
|
||||||
|
|
||||||
|
func body(content: Content) -> some View {
|
||||||
|
content
|
||||||
|
.overlay(
|
||||||
|
shimmer
|
||||||
|
.mask(content)
|
||||||
|
.opacity(active ? 1 : 0)
|
||||||
|
)
|
||||||
|
.onAppear {
|
||||||
|
guard active else { return }
|
||||||
|
animate()
|
||||||
|
}
|
||||||
|
.onChange(of: active) { isActive in
|
||||||
|
if isActive {
|
||||||
|
phase = -1
|
||||||
|
animate()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var shimmer: some View {
|
||||||
|
LinearGradient(
|
||||||
|
gradient: Gradient(colors: [
|
||||||
|
.clear,
|
||||||
|
Color.white.opacity(0.6),
|
||||||
|
.clear
|
||||||
|
]),
|
||||||
|
startPoint: .top,
|
||||||
|
endPoint: .bottom
|
||||||
|
)
|
||||||
|
.rotationEffect(.degrees(70))
|
||||||
|
.offset(x: phase * 250)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func animate() {
|
||||||
|
withAnimation(.linear(duration: 1.2).repeatForever(autoreverses: false)) {
|
||||||
|
phase = 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension View {
|
||||||
|
func shimmering(active: Bool) -> some View {
|
||||||
|
modifier(ShimmerModifier(active: active))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -103,16 +103,26 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
|
let initialID: UUID?
|
||||||
if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
|
if let storedID = UserDefaults.standard.string(forKey: "selectedServerID"),
|
||||||
let uuid = UUID(uuidString: storedID),
|
let uuid = UUID(uuidString: storedID),
|
||||||
servers.contains(where: { $0.id == uuid }) {
|
servers.contains(where: { $0.id == uuid }) {
|
||||||
print("✅ [MainView] Restored selected server \(uuid)")
|
print("✅ [MainView] Restored selected server \(uuid)")
|
||||||
selectedServerID = uuid
|
initialID = uuid
|
||||||
} else if selectedServerID == nil, let first = servers.first {
|
} else if let first = servers.first {
|
||||||
print("✅ [MainView] Selecting first server \(first.hostname)")
|
print("✅ [MainView] Selecting first server \(first.hostname)")
|
||||||
selectedServerID = first.id
|
initialID = first.id
|
||||||
} else {
|
} else {
|
||||||
print("ℹ️ [MainView] No stored selection")
|
print("ℹ️ [MainView] No stored selection")
|
||||||
|
initialID = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
selectedServerID = initialID
|
||||||
|
|
||||||
|
if let initialID {
|
||||||
|
Task {
|
||||||
|
await prefetchOtherServers(activeID: initialID)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
pingAllServers()
|
pingAllServers()
|
||||||
pingTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { _ in
|
pingTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { _ in
|
||||||
@@ -158,6 +168,39 @@ struct MainView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private func prefetchOtherServers(activeID: UUID) async {
|
||||||
|
let others = servers.filter { $0.id != activeID }
|
||||||
|
await withTaskGroup(of: Void.self) { group in
|
||||||
|
for server in others {
|
||||||
|
group.addTask {
|
||||||
|
await fetchServerInfoAsync(for: server.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func fetchServerInfoAsync(for id: UUID) async {
|
||||||
|
guard let server = servers.first(where: { $0.id == id }) else { return }
|
||||||
|
guard let apiKey = KeychainHelper.loadApiKey(for: server.hostname)?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||||
|
!apiKey.isEmpty,
|
||||||
|
let baseURL = URL(string: "https://\(server.hostname)")
|
||||||
|
else { return }
|
||||||
|
|
||||||
|
do {
|
||||||
|
let api = try await APIFactory.detectAndCreateAPI(baseURL: baseURL, apiKey: apiKey)
|
||||||
|
let info = try await api.fetchServerSummary(apiKey: apiKey)
|
||||||
|
await MainActor.run {
|
||||||
|
if let index = servers.firstIndex(where: { $0.id == id }) {
|
||||||
|
var updated = servers[index]
|
||||||
|
updated.info = info
|
||||||
|
servers[index] = updated
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
print("❌ Prefetch failed for \(server.hostname): \(error)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private func moveServer(from source: IndexSet, to destination: Int) {
|
private func moveServer(from source: IndexSet, to destination: Int) {
|
||||||
servers.move(fromOffsets: source, toOffset: destination)
|
servers.move(fromOffsets: source, toOffset: destination)
|
||||||
saveServerOrder()
|
saveServerOrder()
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ struct TableRowView<Label: View, Value: View>: View {
|
|||||||
HStack(alignment: .top) {
|
HStack(alignment: .top) {
|
||||||
label()
|
label()
|
||||||
.frame(width: 180, alignment: .leading)
|
.frame(width: 180, alignment: .leading)
|
||||||
|
.unredacted()
|
||||||
|
|
||||||
value()
|
value()
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
|||||||
@@ -12,6 +12,10 @@ struct ServerDetailView: View {
|
|||||||
var isFetching: Bool
|
var isFetching: Bool
|
||||||
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
@AppStorage("showIntervalIndicator") private var showIntervalIndicator: Bool = true
|
||||||
|
|
||||||
|
private var showPlaceholder: Bool {
|
||||||
|
server.info == nil
|
||||||
|
}
|
||||||
|
|
||||||
@State private var progress: Double = 0
|
@State private var progress: Double = 0
|
||||||
let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
|
let timer = Timer.publish(every: 1.0 / 60.0, on: .main, in: .common).autoconnect()
|
||||||
|
|
||||||
@@ -24,37 +28,33 @@ struct ServerDetailView: View {
|
|||||||
.frame(height: 2)
|
.frame(height: 2)
|
||||||
}
|
}
|
||||||
|
|
||||||
if server.info == nil {
|
ZStack(alignment: .topTrailing) {
|
||||||
ProgressView("Fetching server info...")
|
VStack(spacing: 0) {
|
||||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
Spacer().frame(height: 6)
|
||||||
} else {
|
TabView {
|
||||||
ZStack(alignment: .topTrailing) {
|
GeneralView(server: resolvedBinding)
|
||||||
VStack(spacing: 0) {
|
.tabItem {
|
||||||
Spacer().frame(height: 6)
|
Text("General").unredacted()
|
||||||
TabView {
|
}
|
||||||
GeneralView(server: $server)
|
ResourcesView(server: resolvedBinding)
|
||||||
.tabItem {
|
.tabItem {
|
||||||
Text("General")
|
Text("Resources").unredacted()
|
||||||
}
|
}
|
||||||
ResourcesView(server: $server)
|
ServicesView(server: resolvedBinding)
|
||||||
.tabItem {
|
.tabItem {
|
||||||
Text("Resources")
|
Text("Services").unredacted()
|
||||||
}
|
}
|
||||||
ServicesView(server: $server)
|
|
||||||
.tabItem {
|
|
||||||
Text("Services")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFetching {
|
|
||||||
ProgressView()
|
|
||||||
.scaleEffect(0.5)
|
|
||||||
.padding()
|
|
||||||
}
|
}
|
||||||
|
.redacted(reason: showPlaceholder ? .placeholder : [])
|
||||||
|
.shimmering(active: showPlaceholder)
|
||||||
|
}
|
||||||
|
|
||||||
|
if showPlaceholder || isFetching {
|
||||||
|
LoadingBadge()
|
||||||
|
.padding()
|
||||||
}
|
}
|
||||||
.padding(0)
|
|
||||||
}
|
}
|
||||||
|
.padding(0)
|
||||||
}
|
}
|
||||||
.onReceive(timer) { _ in
|
.onReceive(timer) { _ in
|
||||||
guard showIntervalIndicator else { return }
|
guard showIntervalIndicator else { return }
|
||||||
@@ -64,6 +64,17 @@ struct ServerDetailView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private var resolvedBinding: Binding<Server> {
|
||||||
|
if showPlaceholder {
|
||||||
|
return .constant(placeholderServer())
|
||||||
|
}
|
||||||
|
return $server
|
||||||
|
}
|
||||||
|
|
||||||
|
private func placeholderServer() -> Server {
|
||||||
|
Server(id: server.id, hostname: server.hostname, info: .placeholder, pingable: server.pingable)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#Preview {
|
#Preview {
|
||||||
@@ -72,3 +83,16 @@ struct ServerDetailView: View {
|
|||||||
isFetching: false
|
isFetching: false
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private struct LoadingBadge: View {
|
||||||
|
var body: some View {
|
||||||
|
HStack(spacing: 6) {
|
||||||
|
ProgressView()
|
||||||
|
.scaleEffect(0.5)
|
||||||
|
Text("Fetching latest data…")
|
||||||
|
.font(.caption)
|
||||||
|
}
|
||||||
|
.padding(8)
|
||||||
|
.background(.ultraThinMaterial, in: Capsule())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,9 +6,20 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
#if os(macOS)
|
||||||
|
import AppKit
|
||||||
|
#endif
|
||||||
|
|
||||||
@main
|
@main
|
||||||
struct iKeyMonApp: App {
|
struct iKeyMonApp: App {
|
||||||
|
init() {
|
||||||
|
#if os(macOS)
|
||||||
|
if let customIcon = NSImage(named: "AppIcon") {
|
||||||
|
NSApplication.shared.applicationIconImage = customIcon
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
var body: some Scene {
|
var body: some Scene {
|
||||||
WindowGroup {
|
WindowGroup {
|
||||||
MainView()
|
MainView()
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */; };
|
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */; };
|
||||||
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */; };
|
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */; };
|
||||||
52A9B8BB2ECA3605004DD4A2 /* NOTES.md in Sources */ = {isa = PBXBuildFile; fileRef = 52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */; };
|
52A9B9722ECF751C004DD4A2 /* signing.env.example in Resources */ = {isa = PBXBuildFile; fileRef = 52A9B9712ECF751C004DD4A2 /* signing.env.example */; };
|
||||||
/* End PBXBuildFile section */
|
/* End PBXBuildFile section */
|
||||||
|
|
||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iKeyMon.entitlements; sourceTree = "<group>"; };
|
52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = iKeyMon.entitlements; sourceTree = "<group>"; };
|
||||||
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
|
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
|
||||||
52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = NOTES.md; sourceTree = "<group>"; };
|
52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = NOTES.md; sourceTree = "<group>"; };
|
||||||
|
52A9B9712ECF751C004DD4A2 /* signing.env.example */ = {isa = PBXFileReference; lastKnownFileType = text; path = signing.env.example; sourceTree = "<group>"; };
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
/* Begin PBXFileSystemSynchronizedRootGroup section */
|
/* Begin PBXFileSystemSynchronizedRootGroup section */
|
||||||
@@ -48,12 +49,13 @@
|
|||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
52A9B8BE2ECB68B5004DD4A2 /* Sources */,
|
52A9B8BE2ECB68B5004DD4A2 /* Sources */,
|
||||||
52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */,
|
|
||||||
52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */,
|
52A9B7872EC8E7EE004DD4A2 /* Assets.xcassets */,
|
||||||
52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */,
|
52A9B7882EC8E7EE004DD4A2 /* iKeyMon.entitlements */,
|
||||||
52A9B8F72ECB6B8A004DD4A2 /* Preview Content */,
|
52A9B8F72ECB6B8A004DD4A2 /* Preview Content */,
|
||||||
5203C24E2D997D2800576D4A /* Products */,
|
5203C24E2D997D2800576D4A /* Products */,
|
||||||
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */,
|
52A9B8212EC8FA8A004DD4A2 /* CHANGELOG.md */,
|
||||||
|
52A9B8BA2ECA35FB004DD4A2 /* NOTES.md */,
|
||||||
|
52A9B9712ECF751C004DD4A2 /* signing.env.example */,
|
||||||
);
|
);
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
@@ -132,6 +134,7 @@
|
|||||||
files = (
|
files = (
|
||||||
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */,
|
52A9B8222EC8FA8A004DD4A2 /* CHANGELOG.md in Resources */,
|
||||||
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */,
|
52A9B79F2EC8E7EE004DD4A2 /* Assets.xcassets in Resources */,
|
||||||
|
52A9B9722ECF751C004DD4A2 /* signing.env.example in Resources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@@ -142,7 +145,6 @@
|
|||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
52A9B8BB2ECA3605004DD4A2 /* NOTES.md in Sources */,
|
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
@@ -281,6 +283,7 @@
|
|||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
|
INFOPLIST_KEY_CFBundleIconName = AppIcon;
|
||||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
@@ -308,6 +311,7 @@
|
|||||||
ENABLE_HARDENED_RUNTIME = YES;
|
ENABLE_HARDENED_RUNTIME = YES;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
|
INFOPLIST_KEY_CFBundleIconName = AppIcon;
|
||||||
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
INFOPLIST_KEY_NSHumanReadableCopyright = "";
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
|
|||||||
85
scripts/build_release.sh
Executable file
@@ -0,0 +1,85 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
|
BUILD_DIR="$ROOT_DIR/build"
|
||||||
|
ARTIFACTS_DIR="$ROOT_DIR/dist"
|
||||||
|
SCHEME="iKeyMon"
|
||||||
|
PROJECT="iKeyMon.xcodeproj"
|
||||||
|
CREDENTIALS_FILE="$ROOT_DIR/.signing.env"
|
||||||
|
|
||||||
|
if [[ -f "$CREDENTIALS_FILE" ]]; then
|
||||||
|
# shellcheck disable=SC1090
|
||||||
|
source "$CREDENTIALS_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR"
|
||||||
|
mkdir -p "$ARTIFACTS_DIR"
|
||||||
|
|
||||||
|
xcodebuild \
|
||||||
|
-project "$ROOT_DIR/$PROJECT" \
|
||||||
|
-scheme "$SCHEME" \
|
||||||
|
-configuration Release \
|
||||||
|
-derivedDataPath "$BUILD_DIR" \
|
||||||
|
CODE_SIGNING_ALLOWED=NO \
|
||||||
|
clean build
|
||||||
|
|
||||||
|
APP_PATH="$BUILD_DIR/Build/Products/Release/iKeyMon.app"
|
||||||
|
if [[ ! -d "$APP_PATH" ]]; then
|
||||||
|
echo "❌ Failed to find built app at $APP_PATH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "${CODESIGN_IDENTITY:-}" ]]; then
|
||||||
|
echo "🔏 Codesigning app with identity: $CODESIGN_IDENTITY"
|
||||||
|
codesign \
|
||||||
|
--deep \
|
||||||
|
--force \
|
||||||
|
--options runtime \
|
||||||
|
--timestamp \
|
||||||
|
--entitlements "$ROOT_DIR/iKeyMon.entitlements" \
|
||||||
|
--sign "$CODESIGN_IDENTITY" \
|
||||||
|
"$APP_PATH"
|
||||||
|
else
|
||||||
|
echo "⚠️ Skipping codesign (CODESIGN_IDENTITY not set)."
|
||||||
|
fi
|
||||||
|
|
||||||
|
STAGING_DIR=$(mktemp -d)
|
||||||
|
mkdir -p "$STAGING_DIR"
|
||||||
|
cp -R "$APP_PATH" "$STAGING_DIR/"
|
||||||
|
ln -s /Applications "$STAGING_DIR/Applications"
|
||||||
|
mkdir -p "$STAGING_DIR/.background"
|
||||||
|
cp "$ROOT_DIR/Assets/dmg_background.png" "$STAGING_DIR/.background/background.png"
|
||||||
|
|
||||||
|
VERSION=$(xcodebuild \
|
||||||
|
-project "$ROOT_DIR/$PROJECT" \
|
||||||
|
-scheme "$SCHEME" \
|
||||||
|
-configuration Release \
|
||||||
|
-showBuildSettings | awk '/MARKETING_VERSION/ {print $3; exit}')
|
||||||
|
if [[ -z "$VERSION" ]]; then
|
||||||
|
VERSION="dev"
|
||||||
|
fi
|
||||||
|
ZIP_NAME="iKeyMon-${VERSION}.zip"
|
||||||
|
pushd "$(dirname "$APP_PATH")" >/dev/null
|
||||||
|
zip -r "$ARTIFACTS_DIR/$ZIP_NAME" "$(basename "$APP_PATH")"
|
||||||
|
popd >/dev/null
|
||||||
|
|
||||||
|
DMG_NAME="iKeyMon-${VERSION}.dmg"
|
||||||
|
hdiutil create -volname "iKeyMon" -srcfolder "$STAGING_DIR" -ov -format UDZO "$ARTIFACTS_DIR/$DMG_NAME"
|
||||||
|
|
||||||
|
if [[ -n "${NOTARY_APPLE_ID:-}" && -n "${NOTARY_TEAM_ID:-}" && -n "${NOTARY_PASSWORD:-}" ]]; then
|
||||||
|
echo "📝 Submitting DMG for notarization..."
|
||||||
|
xcrun notarytool submit "$ARTIFACTS_DIR/$DMG_NAME" \
|
||||||
|
--apple-id "$NOTARY_APPLE_ID" \
|
||||||
|
--team-id "$NOTARY_TEAM_ID" \
|
||||||
|
--password "$NOTARY_PASSWORD" \
|
||||||
|
--wait
|
||||||
|
xcrun stapler staple "$ARTIFACTS_DIR/$DMG_NAME"
|
||||||
|
else
|
||||||
|
echo "⚠️ Skipping notarization (NOTARY_* variables not set)."
|
||||||
|
fi
|
||||||
|
rm -rf "$STAGING_DIR"
|
||||||
|
|
||||||
|
echo "✅ Build complete. Artifacts:"
|
||||||
|
echo " - $ARTIFACTS_DIR/$ZIP_NAME"
|
||||||
|
echo " - $ARTIFACTS_DIR/$DMG_NAME"
|
||||||
4
signing.env.example
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
CODESIGN_IDENTITY="Developer ID Application: Your Name (TEAMID1234)"
|
||||||
|
NOTARY_APPLE_ID="appleid@example.com"
|
||||||
|
NOTARY_TEAM_ID="TEAMID1234"
|
||||||
|
NOTARY_PASSWORD="app-specific-password"
|
||||||