Skip to content

Commit 5bd6e76

Browse files
sammcjsammcj
committed
fix: Apple calendar permissions, bump deployment targets
1 parent 48373d7 commit 5bd6e76

File tree

6 files changed

+92
-74
lines changed

6 files changed

+92
-74
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ For next releases info look here: <https://github.com/leits/MeetingBar/releases>
44

55
## Unreleased
66

7+
* Updated project for Xcode 26.3 / Swift 6
8+
* Bumped minimum macOS deployment target to 15.6
9+
* Migrated sandbox entitlements from .entitlements file to build settings
10+
* Added Chinese (Simplified) and Portuguese localisations
711
* Fix typo in language list (#839)
812

913
## Version 4.11.0

‎MeetingBar.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
attributes = {
173173
BuildIndependentTargetsInParallel = YES;
174174
LastSwiftUpdateCheck = 1420;
175-
LastUpgradeCheck = 1630;
175+
LastUpgradeCheck = 2630;
176176
ORGANIZATIONNAME = "Andrii Leitsius";
177177
TargetAttributes = {
178178
144C01782462D0C3000C9FFC = {
@@ -210,6 +210,8 @@
210210
ko,
211211
ta,
212212
enm,
213+
"zh-Hans",
214+
pt,
213215
);
214216
mainGroup = 144C01702462D0C3000C9FFC;
215217
packageReferences = (
@@ -354,6 +356,7 @@
354356
DEAD_CODE_STRIPPING = YES;
355357
DEBUG_INFORMATION_FORMAT = dwarf;
356358
DEVELOPMENT_ASSET_PATHS = "";
359+
DEVELOPMENT_TEAM = KGH289N6T8;
357360
EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = NO;
358361
ENABLE_STRICT_OBJC_MSGSEND = YES;
359362
ENABLE_TESTABILITY = YES;
@@ -377,6 +380,7 @@
377380
MTL_FAST_MATH = YES;
378381
ONLY_ACTIVE_ARCH = YES;
379382
SDKROOT = macosx;
383+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
380384
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
381385
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
382386
};
@@ -423,6 +427,7 @@
423427
DEAD_CODE_STRIPPING = YES;
424428
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
425429
DEVELOPMENT_ASSET_PATHS = "";
430+
DEVELOPMENT_TEAM = KGH289N6T8;
426431
EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = NO;
427432
ENABLE_NS_ASSERTIONS = NO;
428433
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -438,8 +443,9 @@
438443
MACOSX_DEPLOYMENT_TARGET = 12.0;
439444
MTL_ENABLE_DEBUG_INFO = NO;
440445
MTL_FAST_MATH = YES;
441-
ONLY_ACTIVE_ARCH = NO;
446+
ONLY_ACTIVE_ARCH = YES;
442447
SDKROOT = macosx;
448+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
443449
SWIFT_COMPILATION_MODE = wholemodule;
444450
SWIFT_OPTIMIZATION_LEVEL = "-O";
445451
};
@@ -456,17 +462,21 @@
456462
CURRENT_PROJECT_VERSION = 169;
457463
DEAD_CODE_STRIPPING = YES;
458464
DEVELOPMENT_ASSET_PATHS = "";
465+
ENABLE_APP_SANDBOX = YES;
459466
ENABLE_HARDENED_RUNTIME = YES;
467+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
460468
ENABLE_PREVIEWS = YES;
469+
ENABLE_RESOURCE_ACCESS_CALENDARS = YES;
461470
ENABLE_USER_SCRIPT_SANDBOXING = NO;
471+
ENABLE_USER_SELECTED_FILES = readwrite;
462472
INFOPLIST_FILE = MeetingBar/Info.plist;
463473
INFOPLIST_KEY_CFBundleDisplayName = MeetingBar;
464474
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
465475
LD_RUNPATH_SEARCH_PATHS = (
466476
"$(inherited)",
467477
"@executable_path/../Frameworks",
468478
);
469-
MACOSX_DEPLOYMENT_TARGET = 12.0;
479+
MACOSX_DEPLOYMENT_TARGET = 15.6;
470480
MARKETING_VERSION = 4.11.6;
471481
PRODUCT_BUNDLE_IDENTIFIER = leits.MeetingBar;
472482
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -486,17 +496,21 @@
486496
CURRENT_PROJECT_VERSION = 169;
487497
DEAD_CODE_STRIPPING = YES;
488498
DEVELOPMENT_ASSET_PATHS = "";
499+
ENABLE_APP_SANDBOX = YES;
489500
ENABLE_HARDENED_RUNTIME = YES;
501+
ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
490502
ENABLE_PREVIEWS = YES;
503+
ENABLE_RESOURCE_ACCESS_CALENDARS = YES;
491504
ENABLE_USER_SCRIPT_SANDBOXING = NO;
505+
ENABLE_USER_SELECTED_FILES = readwrite;
492506
INFOPLIST_FILE = MeetingBar/Info.plist;
493507
INFOPLIST_KEY_CFBundleDisplayName = MeetingBar;
494508
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
495509
LD_RUNPATH_SEARCH_PATHS = (
496510
"$(inherited)",
497511
"@executable_path/../Frameworks",
498512
);
499-
MACOSX_DEPLOYMENT_TARGET = 12.0;
513+
MACOSX_DEPLOYMENT_TARGET = 15.6;
500514
MARKETING_VERSION = 4.11.6;
501515
PRODUCT_BUNDLE_IDENTIFIER = leits.MeetingBar;
502516
PRODUCT_NAME = "$(TARGET_NAME)";

‎MeetingBar.xcodeproj/xcshareddata/xcschemes/MeetingBar.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1630"
3+
LastUpgradeVersion = "2630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎MeetingBar/Info.plist‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>ITSAppUsesNonExemptEncryption</key>
6-
<false />
7-
<key>NSCalendarsFullAccessUsageDescription</key>
8-
<string>To get events to show on status bar</string>
9-
<key>CFBundleDevelopmentRegion</key>
10-
<string>$(DEVELOPMENT_LANGUAGE)</string>
11-
<key>CFBundleExecutable</key>
12-
<string>$(EXECUTABLE_NAME)</string>
13-
<key>CFBundleIdentifier</key>
14-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
15-
<key>CFBundleInfoDictionaryVersion</key>
16-
<string>6.0</string>
17-
<key>CFBundleName</key>
18-
<string>$(PRODUCT_NAME)</string>
19-
<key>CFBundlePackageType</key>
20-
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
21-
<key>CFBundleShortVersionString</key>
22-
<string>$(MARKETING_VERSION)</string>
23-
<key>CFBundleTypeRole</key>
24-
<string>Editor</string>
25-
<key>CFBundleURLTypes</key>
26-
<array>
27-
<dict>
28-
<key>CFBundleTypeRole</key>
29-
<string>Editor</string>
30-
<key>CFBundleURLSchemes</key>
31-
<array>
32-
<string>com.googleusercontent.apps.$(GOOGLE_CLIENT_NUMBER)</string>
33-
<string>meetingbar</string>
34-
</array>
35-
</dict>
36-
</array>
37-
<key>CFBundleVersion</key>
38-
<string>$(CURRENT_PROJECT_VERSION)</string>
39-
<key>GOOGLE_AUTH_KEYCHAIN_NAME</key>
40-
<string>$(GOOGLE_AUTH_KEYCHAIN_NAME)</string>
41-
<key>GOOGLE_CLIENT_NUMBER</key>
42-
<string>$(GOOGLE_CLIENT_NUMBER)</string>
43-
<key>GOOGLE_CLIENT_SECRET</key>
44-
<string>$(GOOGLE_CLIENT_SECRET)</string>
45-
<key>LSApplicationCategoryType</key>
46-
<string>public.app-category.productivity</string>
47-
<key>LSMinimumSystemVersion</key>
48-
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
49-
<key>LSUIElement</key>
50-
<true />
51-
<key>NSCalendarsUsageDescription</key>
52-
<string>To get events to show on status bar</string>
53-
<key>NSHumanReadableCopyright</key>
54-
<string>Copyright © 2020 Andrii Leitsius. All rights reserved.</string>
55-
<key>NSMainStoryboardFile</key>
56-
<string>Main</string>
57-
<key>NSPrincipalClass</key>
58-
<string>NSApplication</string>
59-
<key>NSSupportsAutomaticTermination</key>
60-
<true />
61-
<key>NSSupportsSuddenTermination</key>
62-
<true />
63-
</dict>
64-
</plist>
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>$(MARKETING_VERSION)</string>
19+
<key>CFBundleTypeRole</key>
20+
<string>Editor</string>
21+
<key>CFBundleURLTypes</key>
22+
<array>
23+
<dict>
24+
<key>CFBundleTypeRole</key>
25+
<string>Editor</string>
26+
<key>CFBundleURLSchemes</key>
27+
<array>
28+
<string>com.googleusercontent.apps.$(GOOGLE_CLIENT_NUMBER)</string>
29+
<string>meetingbar</string>
30+
</array>
31+
</dict>
32+
</array>
33+
<key>CFBundleVersion</key>
34+
<string>$(CURRENT_PROJECT_VERSION)</string>
35+
<key>GOOGLE_AUTH_KEYCHAIN_NAME</key>
36+
<string>$(GOOGLE_AUTH_KEYCHAIN_NAME)</string>
37+
<key>GOOGLE_CLIENT_NUMBER</key>
38+
<string>$(GOOGLE_CLIENT_NUMBER)</string>
39+
<key>GOOGLE_CLIENT_SECRET</key>
40+
<string>$(GOOGLE_CLIENT_SECRET)</string>
41+
<key>ITSAppUsesNonExemptEncryption</key>
42+
<false/>
43+
<key>LSApplicationCategoryType</key>
44+
<string>public.app-category.productivity</string>
45+
<key>LSMinimumSystemVersion</key>
46+
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
47+
<key>LSUIElement</key>
48+
<true/>
49+
<key>NSCalendarsFullAccessUsageDescription</key>
50+
<string>To get events to show on status bar</string>
51+
<key>NSCalendarsUsageDescription</key>
52+
<string>To get events to show on status bar</string>
53+
<key>NSHumanReadableCopyright</key>
54+
<string>Copyright © 2020 Andrii Leitsius. All rights reserved.</string>
55+
<key>NSMainStoryboardFile</key>
56+
<string>Main</string>
57+
<key>NSPrincipalClass</key>
58+
<string>NSApplication</string>
59+
<key>NSSupportsAutomaticTermination</key>
60+
<true/>
61+
<key>NSSupportsSuddenTermination</key>
62+
<true/>
63+
</dict>
64+
</plist>

‎MeetingBar/MeetingBar.entitlements‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,5 @@
44
<dict>
55
<key>com.apple.developer.usernotifications.time-sensitive</key>
66
<true/>
7-
<key>com.apple.security.app-sandbox</key>
8-
<true/>
9-
<key>com.apple.security.files.user-selected.read-write</key>
10-
<true/>
11-
<key>com.apple.security.network.client</key>
12-
<true/>
13-
<key>com.apple.security.personal-information.calendars</key>
14-
<true/>
157
</dict>
168
</plist>

‎MeetingBar/UI/Views/Changelog/Changelog.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,14 @@ struct ChangelogView: View {
189189
Text("and a lot of bug fixes and translations updates")
190190
}
191191
}
192+
if compareVersions("4.12.0", lastRevisedVersionInChangelog) {
193+
Section(header: Text("Version 4.12")) {
194+
Text("• Updated project for Xcode 26.3 / Swift 6")
195+
Text("• Bumped minimum macOS deployment target to 15.6")
196+
Text("• Migrated sandbox entitlements to build settings")
197+
Text("• Added Chinese (Simplified) and Portuguese localisations")
198+
}
199+
}
192200
}
193201
}.listStyle(SidebarListStyle())
194202
Button("general_close".loco(), action: close)

0 commit comments

Comments
 (0)