mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 19:44:05 +00:00
use swift 6.2 for dev tools (#5720)
This commit is contained in:
+1
-1
Submodule Enterprise updated: 77e925f59c...ee4aca0bd5
+24
-6
@@ -1,13 +1,31 @@
|
|||||||
{
|
{
|
||||||
"originHash" : "3375518f1065bd204579536060f3858ee60d1bfe4fb263b2b392dcc1f81ad629",
|
"originHash" : "ec77bc40677bd20f99d813dea09781e534f4cb4539fb504b27d997b95f98d6d0",
|
||||||
"pins" : [
|
"pins" : [
|
||||||
|
{
|
||||||
|
"identity" : "pkl-swift",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/apple/pkl-swift",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "40e5decb9481c8c5d8c64389255166023c936900",
|
||||||
|
"version" : "0.8.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "semanticversion",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/SwiftPackageIndex/SemanticVersion",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "330bab3e41aad91fb3b1b0f779d1325738e54b93",
|
||||||
|
"version" : "0.5.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"identity" : "swift-argument-parser",
|
"identity" : "swift-argument-parser",
|
||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/apple/swift-argument-parser",
|
"location" : "https://github.com/apple/swift-argument-parser",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "ca37474853a4b5f59a22c74bfdd449b1f6bc4cc2",
|
"revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382",
|
||||||
"version" : "1.8.1"
|
"version" : "1.8.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -16,7 +34,7 @@
|
|||||||
"location" : "https://github.com/element-hq/swift-command-line-tools.git",
|
"location" : "https://github.com/element-hq/swift-command-line-tools.git",
|
||||||
"state" : {
|
"state" : {
|
||||||
"branch" : "main",
|
"branch" : "main",
|
||||||
"revision" : "c085ad85c27970e4bba2dd1180c2a53ab77022ba"
|
"revision" : "17a90e116418c061d6c67ec9fd5c4f40dc2c9028"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -42,8 +60,8 @@
|
|||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/apple/swift-system",
|
"location" : "https://github.com/apple/swift-system",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df",
|
"revision" : "669763cfd5806a67e21972d7e5e2d6b80b1ea985",
|
||||||
"version" : "1.6.4"
|
"version" : "1.6.5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
+7
-3
@@ -1,4 +1,4 @@
|
|||||||
// swift-tools-version: 6.1
|
// swift-tools-version: 6.2
|
||||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||||
|
|
||||||
import PackageDescription
|
import PackageDescription
|
||||||
@@ -20,7 +20,7 @@ if FileManager.default.fileExists(atPath: "Enterprise/Pipeline/Package.swift") {
|
|||||||
let package = Package(
|
let package = Package(
|
||||||
name: "Element Swift",
|
name: "Element Swift",
|
||||||
platforms: [
|
platforms: [
|
||||||
.macOS(.v14)
|
.macOS(.v15)
|
||||||
],
|
],
|
||||||
products: [
|
products: [
|
||||||
.executable(name: "tools", targets: ["Tools"])
|
.executable(name: "tools", targets: ["Tools"])
|
||||||
@@ -35,6 +35,10 @@ let package = Package(
|
|||||||
.product(name: "Yams", package: "Yams"),
|
.product(name: "Yams", package: "Yams"),
|
||||||
.product(name: "Logging", package: "swift-log")
|
.product(name: "Logging", package: "swift-log")
|
||||||
],
|
],
|
||||||
path: "Tools/Sources")
|
path: "Tools/Sources",
|
||||||
|
swiftSettings: [
|
||||||
|
.enableUpcomingFeature("NonisolatedNonsendingByDefault"),
|
||||||
|
.enableUpcomingFeature("InferIsolatedConformances")
|
||||||
|
])
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ struct BuildSDK: AsyncParsableCommand {
|
|||||||
/// Update project.yml with the local path of the SDK.
|
/// Update project.yml with the local path of the SDK.
|
||||||
func updateProjectYAML() throws {
|
func updateProjectYAML() throws {
|
||||||
let yamlURL = URL.projectDirectory.appendingPathComponent("project.yml")
|
let yamlURL = URL.projectDirectory.appendingPathComponent("project.yml")
|
||||||
let yamlString = try String(contentsOf: yamlURL)
|
let yamlString = try String(contentsOf: yamlURL, encoding: .utf8)
|
||||||
guard var projectConfig = try Yams.compose(yaml: yamlString) else { throw Error.failureParsingProjectYAML }
|
guard var projectConfig = try Yams.compose(yaml: yamlString) else { throw Error.failureParsingProjectYAML }
|
||||||
|
|
||||||
projectConfig["packages"]?.mapping?["MatrixRustSDK"]? = ["path": "../matrix-rust-sdk"]
|
projectConfig["packages"]?.mapping?["MatrixRustSDK"]? = ["path": "../matrix-rust-sdk"]
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ struct BumpCalendarVersion: ParsableCommand {
|
|||||||
/// Updates the project YAML with the new version.
|
/// Updates the project YAML with the new version.
|
||||||
private func updateProjectYAML() throws {
|
private func updateProjectYAML() throws {
|
||||||
let yamlURL = URL.projectDirectory.appendingPathComponent("project.yml")
|
let yamlURL = URL.projectDirectory.appendingPathComponent("project.yml")
|
||||||
let yamlString = try String(contentsOf: yamlURL)
|
let yamlString = try String(contentsOf: yamlURL, encoding: .utf8)
|
||||||
|
|
||||||
// Use regex instead of Yams to preserve any whitespace, comments etc in the file.
|
// Use regex instead of Yams to preserve any whitespace, comments etc in the file.
|
||||||
let marketingVersionRegex = /MARKETING_VERSION:\s*([^\s]+)/
|
let marketingVersionRegex = /MARKETING_VERSION:\s*([^\s]+)/
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ struct CI: ParsableCommand {
|
|||||||
/// Reads the `MARKETING_VERSION` from `project.yml`.
|
/// Reads the `MARKETING_VERSION` from `project.yml`.
|
||||||
static func readMarketingVersion() throws -> String {
|
static func readMarketingVersion() throws -> String {
|
||||||
let projectURL = URL.projectDirectory.appending(component: "project.yml")
|
let projectURL = URL.projectDirectory.appending(component: "project.yml")
|
||||||
let projectString = try String(contentsOf: projectURL)
|
let projectString = try String(contentsOf: projectURL, encoding: .utf8)
|
||||||
|
|
||||||
guard let projectConfig = try Yams.compose(yaml: projectString),
|
guard let projectConfig = try Yams.compose(yaml: projectString),
|
||||||
let version = projectConfig["settings"]?["MARKETING_VERSION"]?.string else {
|
let version = projectConfig["settings"]?["MARKETING_VERSION"]?.string else {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ struct ConfigureNightly: AsyncParsableCommand {
|
|||||||
/// Adds the Nightly variant include path to `project.yml` if it isn't already present.
|
/// Adds the Nightly variant include path to `project.yml` if it isn't already present.
|
||||||
private func addNightlyVariant() throws {
|
private func addNightlyVariant() throws {
|
||||||
let projectURL = URL.projectDirectory.appending(component: "project.yml")
|
let projectURL = URL.projectDirectory.appending(component: "project.yml")
|
||||||
let projectString = try String(contentsOf: projectURL)
|
let projectString = try String(contentsOf: projectURL, encoding: .utf8)
|
||||||
guard var projectConfig = try Yams.compose(yaml: projectString) else {
|
guard var projectConfig = try Yams.compose(yaml: projectString) else {
|
||||||
throw ValidationError("Failed to parse project.yml.")
|
throw ValidationError("Failed to parse project.yml.")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ struct ReleaseToGitHub: AsyncParsableCommand {
|
|||||||
|
|
||||||
let releaseDate = Date().formatted(.iso8601.year().month().day())
|
let releaseDate = Date().formatted(.iso8601.year().month().day())
|
||||||
|
|
||||||
let existingContent = try String(contentsOf: changesURL)
|
let existingContent = try String(contentsOf: changesURL, encoding: .utf8)
|
||||||
let newContent = "## Changes in \(version) (\(releaseDate))\(cleanedNotes)\n\n\(existingContent)"
|
let newContent = "## Changes in \(version) (\(releaseDate))\(cleanedNotes)\n\n\(existingContent)"
|
||||||
|
|
||||||
try newContent.write(to: changesURL, atomically: true, encoding: .utf8)
|
try newContent.write(to: changesURL, atomically: true, encoding: .utf8)
|
||||||
|
|||||||
Reference in New Issue
Block a user