Skip to content

Commit

Permalink
Remove Carthage dependency (#148)
Browse files Browse the repository at this point in the history
  • Loading branch information
alphatroya authored Sep 21, 2020
1 parent f3e8c14 commit 8f4fbc9
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 27 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions hooks/post_gen_project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion {{ cookiecutter.name }}/.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
excluded:
- Carthage
- {{ cookiecutter.name }}/Classes/Generated

disabled_rules:
Expand Down
1 change: 0 additions & 1 deletion {{ cookiecutter.name }}/Brewfile
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
brew "mint"
brew "carthage"
Empty file removed {{ cookiecutter.name }}/Cartfile
Empty file.
8 changes: 2 additions & 6 deletions {{ cookiecutter.name }}/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
1 change: 0 additions & 1 deletion {{ cookiecutter.name }}/Mintfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion {{ cookiecutter.name }}/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions {{ cookiecutter.name }}/bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -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:
Expand Down
11 changes: 0 additions & 11 deletions {{ cookiecutter.name }}/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ platform :ios do

desc 'Perform test checks'
lane :test do
bootstrap_carthage
scan(
output_directory: deploy_dir,
)
Expand All @@ -48,8 +47,6 @@ platform :ios do
readonly: true
)

bootstrap_carthage

add_badge(
glob: '/{{ cookiecutter.name }}/**/*.appiconset/*.{png, PNG}'
)
Expand All @@ -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

0 comments on commit 8f4fbc9

Please sign in to comment.