From bd633a1acb09898305897cd0529196a9bfa58811 Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Sun, 21 Dec 2025 11:56:30 +0400 Subject: [PATCH] chore: switch from Makefile to Mise --- MIntfile | 2 -- Makefile | 19 ------------------- Package@swift-5.7.swift | 28 ---------------------------- Package@swift-5.8.swift | 28 ---------------------------- Package@swift-5.9.swift | 29 ----------------------------- mise.toml | 10 ++++++++++ mise/tasks/install.sh | 0 mise/tasks/lint | 13 +++++++++++++ 8 files changed, 23 insertions(+), 106 deletions(-) delete mode 100644 MIntfile delete mode 100644 Makefile delete mode 100644 Package@swift-5.7.swift delete mode 100644 Package@swift-5.8.swift delete mode 100644 Package@swift-5.9.swift create mode 100644 mise.toml create mode 100755 mise/tasks/install.sh create mode 100755 mise/tasks/lint diff --git a/MIntfile b/MIntfile deleted file mode 100644 index 1f32d33..0000000 --- a/MIntfile +++ /dev/null @@ -1,2 +0,0 @@ -nicklockwood/SwiftFormat@0.47.12 -realm/SwiftLint@0.47.1 \ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index 856d64b..0000000 --- a/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -all: bootstrap - -bootstrap: hook - mint bootstrap - -hook: - ln -sf ../../hooks/pre-commit .git/hooks/pre-commit - chmod +x .git/hooks/pre-commit - -mint: - mint bootstrap - -lint: - mint run swiftlint - -fmt: - mint run swiftformat Sources Tests - -.PHONY: all bootstrap hook mint lint fmt \ No newline at end of file diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift deleted file mode 100644 index bd2cc2a..0000000 --- a/Package@swift-5.7.swift +++ /dev/null @@ -1,28 +0,0 @@ -// swift-tools-version: 5.7 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "Atomic", - platforms: [ - .macOS(.v10_15), - .iOS(.v13), - .watchOS(.v6), - .tvOS(.v11), - ], - products: [ - .library(name: "Atomic", targets: ["Atomic"]), - ], - dependencies: [], - targets: [ - .target( - name: "Atomic", - dependencies: [] - ), - .testTarget( - name: "AtomicTests", - dependencies: ["Atomic"] - ), - ] -) diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift deleted file mode 100644 index 4d53272..0000000 --- a/Package@swift-5.8.swift +++ /dev/null @@ -1,28 +0,0 @@ -// swift-tools-version: 5.8 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "Atomic", - platforms: [ - .macOS(.v10_15), - .iOS(.v13), - .watchOS(.v6), - .tvOS(.v11), - ], - products: [ - .library(name: "Atomic", targets: ["Atomic"]), - ], - dependencies: [], - targets: [ - .target( - name: "Atomic", - dependencies: [] - ), - .testTarget( - name: "AtomicTests", - dependencies: ["Atomic"] - ), - ] -) diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift deleted file mode 100644 index 2798917..0000000 --- a/Package@swift-5.9.swift +++ /dev/null @@ -1,29 +0,0 @@ -// swift-tools-version: 5.9 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "Atomic", - platforms: [ - .macOS(.v10_15), - .iOS(.v13), - .watchOS(.v6), - .tvOS(.v11), - .visionOS(.v1), - ], - products: [ - .library(name: "Atomic", targets: ["Atomic"]), - ], - dependencies: [], - targets: [ - .target( - name: "Atomic", - dependencies: [] - ), - .testTarget( - name: "AtomicTests", - dependencies: ["Atomic"] - ), - ] -) diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..9e7282a --- /dev/null +++ b/mise.toml @@ -0,0 +1,10 @@ +[tools] +git-cliff = "2.9.1" +swiftlint = "0.62.2" +swiftformat = "0.58.7" + +[settings] +experimental = true + +[hooks] +postinstall = "mise run install" \ No newline at end of file diff --git a/mise/tasks/install.sh b/mise/tasks/install.sh new file mode 100755 index 0000000..e69de29 diff --git a/mise/tasks/lint b/mise/tasks/lint new file mode 100755 index 0000000..ad12486 --- /dev/null +++ b/mise/tasks/lint @@ -0,0 +1,13 @@ +#!/bin/bash +#MISE description="Lint the atomic package using SwiftLint and SwiftFormat" +#MISE usage flag "-f --fix" help="Fix the fixable issues" + +set -eo pipefail + +if [ "$usage_fix" = "true" ]; then + swiftformat Sources Tests + swiftlint lint --fix --strict --config .swiftlint.yml Sources Tests +else + swiftformat Sources Tests --lint + swiftlint lint --strict --config .swiftlint.yml Sources Tests +fi \ No newline at end of file