Migrate to mise

.github/workflows/generate.yml

@@ -4,19 +4,17 @@ on: [push]
 
 jobs:
   test:
-    runs-on: macos-14
-    env:
-      MINT_PATH: "~/mint_cache"
+    runs-on: macos-15
 
     steps:
       - uses: actions/checkout@v1
 
       - name: Generate project and run tests
         run: |
-          export PATH=~/.rbenv/shims:"$PATH"
-
-          brew install cookiecutter rbenv mint fastlane &&
-          rbenv install 3.0.6 &&
+          brew install cookiecutter mise fastlane &&
+          mise settings set experimental true &&
+          mise activate --shims &&
           cookiecutter --no-input -f . &&
           cd Project &&
+          mise install &&
           fastlane scan

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [3.0] - TBA
+### Changed
+- Обновлена версия Swift до 6.0
+### Removed
+- Удален .git-branches.toml
+- Удален Podfile
+- Удален Makefile, проект мигрирован на использование mise
+- Полностью удалена зависимость от SwiftGen
+
 ## [2.5.0] - 2024-10-16
 ### Added
 - Добавлен `.git-branches.toml` файл для настройки работы проекта с [git-town](https://github.com/git-town/git-town).

README.md

@@ -22,10 +22,10 @@ Here are some of the key features of this project template:
 
 ### Prerequisites
 
-Make sure that `cookiecutter` and `mint` tools are installed. Preferred way to make it is using homebrew.
+Make sure that `cookiecutter` and `mise` tools are installed. Preferred way to make it is using homebrew.
 
 ```sh
-brew install cookiecutter mint
+brew install cookiecutter mise
 ```
 
 ### Bootstrap a new project

hooks/post_gen_project.sh

@@ -1,26 +1,18 @@
 #!/bin/sh
 
-# Generate xcodeproj file
-make project
-#
-# Generate SwiftGen xcfilelist
-make xcfilelist
+# Install all dependencies
+mise install
 
-# Generate SwiftGen files
-make swiftgen
+# Generate xcodeproj file
+mise run project
 
 # Download .gitignore file
 curl -L 'https://www.gitignore.io/api/swift,macos,fastlane' > .gitignore
-echo '.cache' >> .gitignore
 {% if cookiecutter.ignore_xcproject == "Yes" %}
     echo '{{ cookiecutter.name }}.xcodeproj' >> .gitignore
-    echo '{{ cookiecutter.name }}.xcworkspace' >> .gitignore
 {% endif %}
 
-echo 'Pods' >> .gitignore
-
-make fmt
-make gems
+mise run fmt
 
 # Stamp current version of xcode in .xcode-version file
 xcodebuild -version | sed 's/Xcode //' | head -n 1 > .xcode-version
@@ -29,4 +21,4 @@ git init
 git add .
 git commit -m "Initial commit"
 
-make hooks
+mise generate git-pre-commit --write

{{ cookiecutter.name }}/.mise.toml

@@ -0,0 +1,9 @@
+[tasks]
+pre-commit = "swiftformat {{ cookiecutter.name }} {{ cookiecutter.name }}Tests --lint"
+fmt = "swiftformat {{ cookiecutter.name }} {{ cookiecutter.name }}Tests"
+project = "xcodegen"
+
+[tools]
+xcodes = "1.5.0"
+swiftformat = "0.54.6"
+xcodegen = "2.38.0"

{{ cookiecutter.name }}/README.md

@@ -22,4 +22,4 @@ Before launching the project, it's important to confirm that each team member ha
 
 ---
 
-This project was created using [the project template](https://github.com/alphatroya/swift-project-template) version 2.5.0.
+This project was created using [the project template](https://github.com/alphatroya/swift-project-template) version 3.0.0.

{{ cookiecutter.name }}/project.yml

@@ -1,6 +1,5 @@
 name: {{ cookiecutter.name }}
 options:
-  postGenCommand: "make pods"
   deploymentTarget:
     iOS: {{ cookiecutter.deployment_target }}
   developmentLanguage: ru
@@ -19,7 +18,7 @@ settings:
     VERSIONING_SYSTEM: apple-generic
     CURRENT_PROJECT_VERSION: 1
     MARKETING_VERSION: 1.0
-    SWIFT_VERSION: 5.0
+    SWIFT_VERSION: 6.0
     DEVELOPMENT_TEAM: {{ cookiecutter.development_team_id }}
     GENERATE_INFOPLIST_FILE: YES
     INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad: "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"
@@ -40,14 +39,6 @@ targets:
     scheme:
       testTargets:
         - {{ cookiecutter.name | lower }}Tests
-    prebuildScripts:
-      - script: |
-          "${PODS_ROOT}/SwiftGen/bin/swiftgen"
-        name: SwiftGen
-        inputFileLists:
-          - $(SRCROOT)/swiftgen-input-files.xcfilelist
-        outputFileLists:
-          - $(SRCROOT)/swiftgen-output-files.xcfilelist
     attributes:
       ProvisioningStyle: Automatic
       DevelopmentTeam: {{ cookiecutter.development_team_id }}

{{ cookiecutter.name }}/{{ cookiecutter.name }}/Classes/Modules/Extensions/UIViewController+Keyboard.swift

@@ -1,5 +1,6 @@
 import UIKit
 
+@MainActor
 private let kHideKeyboardDelegate = HideKeyboardDelegate()
 
 private class HideKeyboardDelegate: NSObject, UIGestureRecognizerDelegate {
@@ -20,4 +21,3 @@ extension UIViewController {
         view.addGestureRecognizer(tapGesture)
     }
 }
-