Skip to content

Commit 97e00dc

Browse files
exelbanexelban
committed
fix: changed App Group name to fit the requirements. It fixes widgets in macOS 15 but could break macOS 14. Since in the macOS 14 it was not working properly with the team ID prefix (exelban#2115)
1 parent 109bc41 commit 97e00dc

File tree

11 files changed

+17
-11
lines changed

11 files changed

+17
-11
lines changed

‎Kit/module/module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ open class Module {
8080
get { Store.shared.int(key: "\(self.name)_position", defaultValue: 0) }
8181
set { Store.shared.set(key: "\(self.name)_position", value: newValue) }
8282
}
83-
public var userDefaults: UserDefaults? = UserDefaults(suiteName: "eu.exelban.Stats.widgets")
83+
public var userDefaults: UserDefaults? = UserDefaults(suiteName: "\(Bundle.main.object(forInfoDictionaryKey: "TeamId") as! String).eu.exelban.Stats.widgets")
8484

8585
private var settingsView: Settings_v? = nil
8686
private var popup: PopupWindow? = nil

‎Modules/CPU/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>
2222
<string>Copyright © 2020 Serhiy Mytrovtsiy. All rights reserved.</string>
23+
<key>TeamId</key>
24+
<string>RP2S87B72W</string>
2325
</dict>
2426
</plist>

‎Modules/CPU/widget.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public struct CPU_entry: TimelineEntry {
2828
public struct Provider: TimelineProvider {
2929
public typealias Entry = CPU_entry
3030

31-
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "eu.exelban.Stats.widgets")
31+
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "\(Bundle.main.object(forInfoDictionaryKey: "TeamId") as! String).eu.exelban.Stats.widgets")
3232

3333
public func placeholder(in context: Context) -> CPU_entry {
3434
CPU_entry()

‎Modules/Disk/widget.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public struct Disk_entry: TimelineEntry {
2828
public struct Provider: TimelineProvider {
2929
public typealias Entry = Disk_entry
3030

31-
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "eu.exelban.Stats.widgets")
31+
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "\(Bundle.main.object(forInfoDictionaryKey: "TeamId") as! String).eu.exelban.Stats.widgets")
3232

3333
public func placeholder(in context: Context) -> Disk_entry {
3434
Disk_entry()

‎Modules/GPU/widget.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public struct GPU_entry: TimelineEntry {
2828
public struct Provider: TimelineProvider {
2929
public typealias Entry = GPU_entry
3030

31-
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "eu.exelban.Stats.widgets")
31+
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "\(Bundle.main.object(forInfoDictionaryKey: "TeamId") as! String).eu.exelban.Stats.widgets")
3232

3333
public func placeholder(in context: Context) -> GPU_entry {
3434
GPU_entry()

‎Modules/Net/widget.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public struct Network_entry: TimelineEntry {
2828
public struct Provider: TimelineProvider {
2929
public typealias Entry = Network_entry
3030

31-
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "eu.exelban.Stats.widgets")
31+
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "\(Bundle.main.object(forInfoDictionaryKey: "TeamId") as! String).eu.exelban.Stats.widgets")
3232

3333
public func placeholder(in context: Context) -> Network_entry {
3434
Network_entry()

‎Modules/RAM/widget.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public struct RAM_entry: TimelineEntry {
4343
public struct Provider: TimelineProvider {
4444
public typealias Entry = RAM_entry
4545

46-
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "eu.exelban.Stats.widgets")
46+
private let userDefaults: UserDefaults? = UserDefaults(suiteName: "\(Bundle.main.object(forInfoDictionaryKey: "TeamId") as! String).eu.exelban.Stats.widgets")
4747

4848
public func placeholder(in context: Context) -> RAM_entry {
4949
RAM_entry()

‎Stats/Supporting Files/Info.plist

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
<key>SMPrivilegedExecutables</key>
4343
<dict>
4444
<key>eu.exelban.Stats.SMC.Helper</key>
45-
<string>anchor apple generic and identifier "eu.exelban.Stats.SMC.Helper" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = RP2S87B72W)</string>
45+
<string>anchor apple generic and identifier &quot;eu.exelban.Stats.SMC.Helper&quot; and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = RP2S87B72W)</string>
4646
</dict>
47+
<key>TeamId</key>
48+
<string>RP2S87B72W</string>
4749
</dict>
4850
</plist>

‎Stats/Supporting Files/Stats.entitlements

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>com.apple.security.cs.disable-library-validation</key>
6+
<true/>
57
<key>com.apple.security.application-groups</key>
68
<array>
7-
<string>eu.exelban.Stats.widgets</string>
9+
<string>$(TeamIdentifierPrefix)eu.exelban.Stats.widgets</string>
810
</array>
9-
<key>com.apple.security.cs.disable-library-validation</key>
10-
<true/>
1111
</dict>
1212
</plist>

‎Widgets/Supporting Files/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@
2121
</dict>
2222
<key>NSHumanReadableCopyright</key>
2323
<string>Copyright © 2024 Serhiy Mytrovtsiy. All rights reserved.</string>
24+
<key>TeamId</key>
25+
<string>RP2S87B72W</string>
2426
</dict>
2527
</plist>

‎Widgets/Supporting Files/Widgets.entitlements

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<true/>
77
<key>com.apple.security.application-groups</key>
88
<array>
9-
<string>eu.exelban.Stats.widgets</string>
9+
<string>$(TeamIdentifierPrefix)eu.exelban.Stats.widgets</string>
1010
</array>
1111
</dict>
1212
</plist>

0 commit comments

Comments
 (0)