Skip to content

Commit

Permalink
Merge pull request #227 from scade-platform/swift-version-update
Browse files Browse the repository at this point in the history
Swift version update to 5.7
  • Loading branch information
Kristalev authored Oct 25, 2022
2 parents 63b1920 + 6307950 commit 63b3195
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions Nimble/Nimble.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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)";
Expand Down Expand Up @@ -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)";
Expand Down
4 changes: 2 additions & 2 deletions Packages/LSPClient/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"]),
Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions Packages/SwiftExtensions/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PackageDescription
let package = Package(
name: "SwiftExtensions",
platforms: [
.macOS(.v10_15),
.macOS("10.15.4"),
],

products: [
Expand All @@ -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: [
Expand Down
4 changes: 2 additions & 2 deletions Plugins/BuildSystem/BuildSystem.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Plugins/FileIcons/FileIcons.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand All @@ -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 = "";
Expand Down
4 changes: 2 additions & 2 deletions Plugins/ImageViewer/ImageViewer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand All @@ -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 = "";
Expand Down
4 changes: 2 additions & 2 deletions Plugins/LSPClient/LSPClient.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand All @@ -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 = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand All @@ -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 = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion build.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 63b3195

Please sign in to comment.