From 8f4fbc9df32f08bda62d772d4015004173cf68a5 Mon Sep 17 00:00:00 2001 From: Alexey Korolev Date: Mon, 21 Sep 2020 10:33:11 +0300 Subject: [PATCH] Remove Carthage dependency (#148) --- CHANGELOG.md | 4 ++++ hooks/post_gen_project.sh | 5 +---- {{ cookiecutter.name }}/.swiftlint.yml | 1 - {{ cookiecutter.name }}/Brewfile | 1 - {{ cookiecutter.name }}/Cartfile | 0 {{ cookiecutter.name }}/Makefile | 8 ++------ {{ cookiecutter.name }}/Mintfile | 1 - {{ cookiecutter.name }}/README.md | 2 +- {{ cookiecutter.name }}/bitrise.yml | 4 ++-- {{ cookiecutter.name }}/fastlane/Fastfile | 11 ----------- 10 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 {{ cookiecutter.name }}/Cartfile diff --git a/CHANGELOG.md b/CHANGELOG.md index 501b133..343e01f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.2.0] - 2020-09-21 +### Removed +- Удален Carthage, менеджер зависимостей заменен на Swift Package Manager. + ## [1.1.28] - 2020-09-18 ### Changed - Swiftformat утилита обновлена до 0.46.2 diff --git a/hooks/post_gen_project.sh b/hooks/post_gen_project.sh index 8a8aa93..978c6b9 100644 --- a/hooks/post_gen_project.sh +++ b/hooks/post_gen_project.sh @@ -7,15 +7,12 @@ make project make swiftgen # Download .gitignore file -curl -L 'https://www.gitignore.io/api/swift,macos,fastlane,carthage' > .gitignore -echo 'Carthage/Checkouts' >> .gitignore +curl -L 'https://www.gitignore.io/api/swift,macos,fastlane' > .gitignore echo '.idea' >> .gitignore echo 'Templates' >> .gitignore make icon -mint run "carthage/carthage" carthage update --no-use-binaries --platform iOS --no-build - make fmt make gems diff --git a/{{ cookiecutter.name }}/.swiftlint.yml b/{{ cookiecutter.name }}/.swiftlint.yml index c6063ff..6a5339b 100644 --- a/{{ cookiecutter.name }}/.swiftlint.yml +++ b/{{ cookiecutter.name }}/.swiftlint.yml @@ -1,5 +1,4 @@ excluded: - - Carthage - {{ cookiecutter.name }}/Classes/Generated disabled_rules: diff --git a/{{ cookiecutter.name }}/Brewfile b/{{ cookiecutter.name }}/Brewfile index 2c88cb3..d62030f 100644 --- a/{{ cookiecutter.name }}/Brewfile +++ b/{{ cookiecutter.name }}/Brewfile @@ -1,2 +1 @@ brew "mint" -brew "carthage" diff --git a/{{ cookiecutter.name }}/Cartfile b/{{ cookiecutter.name }}/Cartfile deleted file mode 100644 index e69de29..0000000 diff --git a/{{ cookiecutter.name }}/Makefile b/{{ cookiecutter.name }}/Makefile index f722709..9cb1366 100644 --- a/{{ cookiecutter.name }}/Makefile +++ b/{{ cookiecutter.name }}/Makefile @@ -3,13 +3,9 @@ BREW := /usr/local/bin/brew all: bootstrap ## bootstrap: Bootstrap project dependencies for development -bootstrap: hook certs deps homebrew +bootstrap: hook certs homebrew mint bootstrap -## deps: Bootstrap swift dependencies -deps: - mint run carthage/carthage carthage bootstrap --cache-builds --platform ios - ## certs: Download Apple certificates for development certs: gems bundle exec fastlane match development --readonly @@ -74,4 +70,4 @@ help: $(BREW): curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install | ruby -.PHONY: all help bootstrap test gems certs carting lint fmt homebrew deps swiftlint icon project clean hook +.PHONY: all help bootstrap test gems certs lint fmt homebrew swiftlint icon project clean hook diff --git a/{{ cookiecutter.name }}/Mintfile b/{{ cookiecutter.name }}/Mintfile index 0ee8269..716903f 100644 --- a/{{ cookiecutter.name }}/Mintfile +++ b/{{ cookiecutter.name }}/Mintfile @@ -2,6 +2,5 @@ yonaskolb/XcodeGen@2.13.1 realm/swiftlint@0.39.2 swiftgen/swiftgen@6.3.0 Nonchalant/AppIcon@1.0.3 -carthage/carthage@0.35.0 Flinesoft/BartyCrouch@4.1.0 nicklockwood/SwiftFormat@0.46.2 diff --git a/{{ cookiecutter.name }}/README.md b/{{ cookiecutter.name }}/README.md index 0d3a894..65e202e 100644 --- a/{{ cookiecutter.name }}/README.md +++ b/{{ cookiecutter.name }}/README.md @@ -21,7 +21,7 @@ Also, some environment parameters need to be set: The project was generated using the [cookiecutter tool](https://github.com/audreyr/cookiecutter) and [this](https://github.com/alphatroya/swift-project-template) swift template. -Template version: 1.1.28 +Template version: 1.2.0 ## Copyright diff --git a/{{ cookiecutter.name }}/bitrise.yml b/{{ cookiecutter.name }}/bitrise.yml index 00289dd..d35057c 100644 --- a/{{ cookiecutter.name }}/bitrise.yml +++ b/{{ cookiecutter.name }}/bitrise.yml @@ -51,7 +51,7 @@ workflows: is_always_run: true envs: - FASTLANE_LANE: ios test - bootstrap_carthage: + precache_dependencies: steps: - activate-ssh-key: {% raw -%}run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'{%- endraw %} @@ -66,7 +66,7 @@ workflows: # debug log set -x - carthage bootstrap --no-use-binaries --platform iOS --cache-builds + # TODO: complete SPM dependencies caching title: Build Carthage - deploy-to-bitrise-io: {} - cache-push: diff --git a/{{ cookiecutter.name }}/fastlane/Fastfile b/{{ cookiecutter.name }}/fastlane/Fastfile index 6f34534..485988c 100644 --- a/{{ cookiecutter.name }}/fastlane/Fastfile +++ b/{{ cookiecutter.name }}/fastlane/Fastfile @@ -35,7 +35,6 @@ platform :ios do desc 'Perform test checks' lane :test do - bootstrap_carthage scan( output_directory: deploy_dir, ) @@ -48,8 +47,6 @@ platform :ios do readonly: true ) - bootstrap_carthage - add_badge( glob: '/{{ cookiecutter.name }}/**/*.appiconset/*.{png, PNG}' ) @@ -76,12 +73,4 @@ platform :ios do desc 'Deploy a release build' lane :release do end - - private_lane :bootstrap_carthage do - carthage( - platform: 'iOS', - cache_builds: true, - use_binaries: false, - ) - end end