1.6.0 support of package access level introduced in Swift 5.9

MarcoEidinger · Jan 2, 2024 · b122176 · b122176
1 parent 85c459f
commit b122176
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# [1.6.0](https://github.com/MarcoEidinger/SwiftPlantUML-Xcode-Extension/releases/tag/1.6.0)
+
+## Features
+
+- support `package` access level ([SE-0386](https://github.com/apple/swift-evolution/blob/main/proposals/0386-package-access-modifier.md)) introduced in Swift 5.9
+
+## Internal Dependencies
+
+uses [SwiftPlantUML@0.8.0](https://github.com/MarcoEidinger/SwiftPlantUML/releases/tag/0.8.0)
+
 # [1.5.1](https://github.com/MarcoEidinger/SwiftPlantUML-Xcode-Extension/releases/tag/1.5.1)
 
 ## Bug Fixes

diff --git a/SourceEditorExtension/Info.plist b/SourceEditorExtension/Info.plist
@@ -52,6 +52,6 @@
 		<string>com.apple.dt.Xcode.extension.source-editor</string>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 Marco Eidinger. All rights reserved.</string>
+	<string>Copyright © 2021-2024 Marco Eidinger. All rights reserved.</string>
 </dict>
 </plist>
diff --git a/SwiftPlantUMLApp.xcodeproj/project.pbxproj b/SwiftPlantUMLApp.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -586,14 +586,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 6V66CC3AN6;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ActionExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "View Swift Class Diagram";
-				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Marco Eidinger. All rights reserved.";
+				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023-2024 Marco Eidinger. All rights reserved.";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
@@ -617,14 +617,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 6V66CC3AN6;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ActionExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "View Swift Class Diagram";
-				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Marco Eidinger. All rights reserved.";
+				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023-2024 Marco Eidinger. All rights reserved.";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
@@ -769,7 +769,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"SwiftPlantUMLApp/Preview Content\"";
 				DEVELOPMENT_TEAM = 6V66CC3AN6;
@@ -799,7 +799,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"SwiftPlantUMLApp/Preview Content\"";
 				DEVELOPMENT_TEAM = 6V66CC3AN6;
@@ -826,7 +826,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 6V66CC3AN6;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -852,7 +852,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 6V66CC3AN6;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -879,7 +879,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 6V66CC3AN6;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -907,7 +907,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 6V66CC3AN6;
 				ENABLE_HARDENED_RUNTIME = YES;

diff --git a/SwiftPlantUMLApp/Info.plist b/SwiftPlantUMLApp/Info.plist
@@ -38,7 +38,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 Marco Eidinger. All rights reserved.</string>
+	<string>Copyright © 2021-2024 Marco Eidinger. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>

diff --git a/XPCService/Info.plist b/XPCService/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2021 Marco Eidinger. All rights reserved.</string>
+	<string>Copyright © 2021-2024 Marco Eidinger. All rights reserved.</string>
 	<key>XPCService</key>
 	<dict>
 		<key>ServiceType</key>

diff --git a/XPCService/XPCService.swift b/XPCService/XPCService.swift
@@ -22,6 +22,9 @@ import SwiftPlantUMLFramework
 
     @UserDefaultsWrapper(UserDefaultsKeys.SettingsKeys.showMembersWithAccessLevelPublic.key, defaultValue: true)
     var showMembersWithAccessLevelPublic: Bool
+
+    @UserDefaultsWrapper(UserDefaultsKeys.SettingsKeys.showMembersWithAccessLevelPackage.key, defaultValue: true)
+    var showMembersWithAccessLevelPackage: Bool
 
     @UserDefaultsWrapper(UserDefaultsKeys.SettingsKeys.showMembersWithAccessLevelInternal.key, defaultValue: true)
     var showMembersWithAccessLevelInternal: Bool
@@ -35,6 +38,10 @@ import SwiftPlantUMLFramework
     @UserDefaultsWrapper(UserDefaultsKeys.SettingsKeys.showElementsWithAccessLevelPublic.key, defaultValue: true)
     var showElementsWithAccessLevelPublic: Bool
 
+    @UserDefaultsWrapper(UserDefaultsKeys.SettingsKeys.showElementsWithAccessLevelPackage.key, defaultValue: true)
+    var showElementsWithAccessLevelPackage: Bool
+
+
     @UserDefaultsWrapper(UserDefaultsKeys.SettingsKeys.showElementsWithAccessLevelInternal.key, defaultValue: true)
     var showElementsWithAccessLevelInternal: Bool
 
@@ -53,6 +60,9 @@ import SwiftPlantUMLFramework
         if showElementsWithAccessLevelPublic {
             showElementsWithAccessLevel.append(.public)
         }
+        if showElementsWithAccessLevelPackage {
+            showElementsWithAccessLevel.append(.package)
+        }
         if showElementsWithAccessLevelInternal {
             showElementsWithAccessLevel.append(.internal)
         }
@@ -70,6 +80,9 @@ import SwiftPlantUMLFramework
         if showMembersWithAccessLevelPublic {
             showMembersWithAccessLevel.append(.public)
         }
+        if showMembersWithAccessLevelPackage {
+            showMembersWithAccessLevel.append(.package)
+        }
         if showMembersWithAccessLevelInternal {
             showMembersWithAccessLevel.append(.internal)
         }