From f7d269b50924fb73fc951fa1ea0a7e5607c3bf54 Mon Sep 17 00:00:00 2001 From: Alexander Esilevich Date: Tue, 25 Oct 2022 14:39:25 +0100 Subject: [PATCH 1/3] updated macos deployment version to 11.0 --- Nimble/Nimble.xcodeproj/project.pbxproj | 4 ++-- Plugins/BuildSystem/BuildSystem.xcodeproj/project.pbxproj | 4 ++-- .../CodeEditor/CodeEditor.xcodeproj/project.pbxproj | 4 ++-- Plugins/FileIcons/FileIcons.xcodeproj/project.pbxproj | 4 ++-- Plugins/ImageViewer/ImageViewer.xcodeproj/project.pbxproj | 4 ++-- Plugins/LSPClient/LSPClient.xcodeproj/project.pbxproj | 4 ++-- .../LangExtensions/LangExtensions.xcodeproj/project.pbxproj | 4 ++-- .../ProjectNavigator.xcodeproj/project.pbxproj | 4 ++-- .../SwiftExtensions/SwiftExtensions.xcodeproj/project.pbxproj | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Nimble/Nimble.xcodeproj/project.pbxproj b/Nimble/Nimble.xcodeproj/project.pbxproj index 3278d447..418cfa0f 100644 --- a/Nimble/Nimble.xcodeproj/project.pbxproj +++ b/Nimble/Nimble.xcodeproj/project.pbxproj @@ -679,7 +679,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 0.4; PRODUCT_BUNDLE_IDENTIFIER = com.scade.Nimble; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -707,7 +707,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 0.4; PRODUCT_BUNDLE_IDENTIFIER = com.scade.Nimble; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Plugins/BuildSystem/BuildSystem.xcodeproj/project.pbxproj b/Plugins/BuildSystem/BuildSystem.xcodeproj/project.pbxproj index c9556795..b38bc4ee 100644 --- a/Plugins/BuildSystem/BuildSystem.xcodeproj/project.pbxproj +++ b/Plugins/BuildSystem/BuildSystem.xcodeproj/project.pbxproj @@ -331,7 +331,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.BuildSystem; PRODUCT_MODULE_NAME = BuildSystemPlugin; PRODUCT_NAME = BuildSystem; @@ -357,7 +357,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.BuildSystem; PRODUCT_MODULE_NAME = BuildSystemPlugin; PRODUCT_NAME = BuildSystem; diff --git a/Plugins/CodeEditor/CodeEditor/CodeEditor.xcodeproj/project.pbxproj b/Plugins/CodeEditor/CodeEditor/CodeEditor.xcodeproj/project.pbxproj index b582d259..ff47b7db 100644 --- a/Plugins/CodeEditor/CodeEditor/CodeEditor.xcodeproj/project.pbxproj +++ b/Plugins/CodeEditor/CodeEditor/CodeEditor.xcodeproj/project.pbxproj @@ -419,7 +419,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.CodeEditor; PRODUCT_MODULE_NAME = CodeEditorPlugin; PRODUCT_NAME = CodeEditor; @@ -453,7 +453,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.CodeEditor; PRODUCT_MODULE_NAME = CodeEditorPlugin; PRODUCT_NAME = CodeEditor; diff --git a/Plugins/FileIcons/FileIcons.xcodeproj/project.pbxproj b/Plugins/FileIcons/FileIcons.xcodeproj/project.pbxproj index da0525aa..8ccf7b6f 100644 --- a/Plugins/FileIcons/FileIcons.xcodeproj/project.pbxproj +++ b/Plugins/FileIcons/FileIcons.xcodeproj/project.pbxproj @@ -283,7 +283,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Plugins; - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.AFileIcon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -304,7 +304,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Plugins; - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.AFileIcon; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Plugins/ImageViewer/ImageViewer.xcodeproj/project.pbxproj b/Plugins/ImageViewer/ImageViewer.xcodeproj/project.pbxproj index d5ba3e63..6a49c124 100644 --- a/Plugins/ImageViewer/ImageViewer.xcodeproj/project.pbxproj +++ b/Plugins/ImageViewer/ImageViewer.xcodeproj/project.pbxproj @@ -285,7 +285,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Plugins; - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.ImageViewer; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -304,7 +304,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Plugins; - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.ImageViewer; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Plugins/LSPClient/LSPClient.xcodeproj/project.pbxproj b/Plugins/LSPClient/LSPClient.xcodeproj/project.pbxproj index b63e88e4..c28ef4cb 100644 --- a/Plugins/LSPClient/LSPClient.xcodeproj/project.pbxproj +++ b/Plugins/LSPClient/LSPClient.xcodeproj/project.pbxproj @@ -285,7 +285,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.LSPClient; PRODUCT_MODULE_NAME = LSPClientPlugin; PRODUCT_NAME = LSPClient; @@ -311,7 +311,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.LSPClient; PRODUCT_MODULE_NAME = LSPClientPlugin; PRODUCT_NAME = LSPClient; diff --git a/Plugins/LangExtensions/LangExtensions.xcodeproj/project.pbxproj b/Plugins/LangExtensions/LangExtensions.xcodeproj/project.pbxproj index 71d28bab..1602fa75 100644 --- a/Plugins/LangExtensions/LangExtensions.xcodeproj/project.pbxproj +++ b/Plugins/LangExtensions/LangExtensions.xcodeproj/project.pbxproj @@ -419,7 +419,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = LangExtensions/Info.plist; INSTALL_PATH = /Plugins; - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.LangExtensions; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -436,7 +436,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = LangExtensions/Info.plist; INSTALL_PATH = /Plugins; - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.LangExtensions; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Plugins/ProjectNavigator/ProjectNavigator.xcodeproj/project.pbxproj b/Plugins/ProjectNavigator/ProjectNavigator.xcodeproj/project.pbxproj index 1bec443b..eba9cb2b 100644 --- a/Plugins/ProjectNavigator/ProjectNavigator.xcodeproj/project.pbxproj +++ b/Plugins/ProjectNavigator/ProjectNavigator.xcodeproj/project.pbxproj @@ -307,7 +307,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.ProjectNavigator; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -333,7 +333,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.ProjectNavigator; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Plugins/SwiftExtensions/SwiftExtensions.xcodeproj/project.pbxproj b/Plugins/SwiftExtensions/SwiftExtensions.xcodeproj/project.pbxproj index c24e2415..0a1ebede 100644 --- a/Plugins/SwiftExtensions/SwiftExtensions.xcodeproj/project.pbxproj +++ b/Plugins/SwiftExtensions/SwiftExtensions.xcodeproj/project.pbxproj @@ -333,7 +333,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.SwiftExtensions; PRODUCT_MODULE_NAME = SwiftExtensionsPlugin; @@ -365,7 +365,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15.1; + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.scade.nimble.SwiftExtensions; From ebeb8061f26ce8a58382aa900b143dbdce1b6704 Mon Sep 17 00:00:00 2001 From: Alexander Esilevich Date: Tue, 25 Oct 2022 14:50:20 +0100 Subject: [PATCH 2/3] updated LSP version to 5.7 --- Packages/LSPClient/Package.swift | 4 ++-- Packages/SwiftExtensions/Package.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Packages/LSPClient/Package.swift b/Packages/LSPClient/Package.swift index 6d66e975..2c50b044 100644 --- a/Packages/LSPClient/Package.swift +++ b/Packages/LSPClient/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "LSPClient", platforms: [ - .macOS(.v10_15), + .macOS("10.15.4"), ], products: [ .library(name: "LSPClient", type: .dynamic, targets: ["LSPClient"]), @@ -15,7 +15,7 @@ let package = Package( .package(path: "../BuildSystem"), .package(path: "../CodeEditor"), - .package(name: "SourceKitLSP", url: "https://github.com/FLORG1/sourcekit-lsp.git", .branch("release/5.5")) + .package(name: "SourceKitLSP", url: "https://github.com/FLORG1/sourcekit-lsp.git", .branch("release/5.7")) ], targets: [ .target( diff --git a/Packages/SwiftExtensions/Package.swift b/Packages/SwiftExtensions/Package.swift index 6a907cc8..7023ee85 100644 --- a/Packages/SwiftExtensions/Package.swift +++ b/Packages/SwiftExtensions/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "SwiftExtensions", platforms: [ - .macOS(.v10_15), + .macOS("10.15.4"), ], products: [ @@ -18,7 +18,7 @@ let package = Package( .package(path: "../BuildSystem"), .package(path: "../LSPClient"), - .package(name: "SourceKitLSP", url: "https://github.com/FLORG1/sourcekit-lsp.git", .branch("release/5.5")), + .package(name: "SourceKitLSP", url: "https://github.com/FLORG1/sourcekit-lsp.git", .branch("release/5.7")), ], targets: [ From 630795065bcc961f3c2d9df36653d2013efe8a54 Mon Sep 17 00:00:00 2001 From: Alexander Esilevich Date: Tue, 25 Oct 2022 18:01:42 +0100 Subject: [PATCH 3/3] updated macos deployment version to 11.0 in build.xconfig --- build.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xcconfig b/build.xcconfig index 51ac33da..773ec5b5 100644 --- a/build.xcconfig +++ b/build.xcconfig @@ -7,7 +7,7 @@ // Configuration settings file format documentation can be found at: // https://help.apple.com/xcode/#/dev745c5c974 -MACOSX_DEPLOYMENT_TARGET = 10.15.1 +MACOSX_DEPLOYMENT_TARGET = 11.0 // Custom variables BUILT_PRODUCT_CONTENTS_DIR = $(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/Contents