Skip to content

Commit

Permalink
fix 'pod trunk push' commands
Browse files Browse the repository at this point in the history
must push one spec at a time, and if more than one exists,
must specify them by name.

Also include the 'LICENSE' file in the portable zip and let
SwiftLint.podspec know about it.
  • Loading branch information
jpsim committed Dec 19, 2016
1 parent 83f0911 commit 7abbd84
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Makefile
Expand Up @@ -74,7 +74,7 @@ portable_zip: installables
install_name_tool -rpath "/Library/Frameworks/SwiftLintFramework.framework/Versions/Current/Frameworks" "@executable_path/SwiftLintFramework.framework/Versions/Current/Frameworks" "$(TEMPORARY_FOLDER)/swiftlint"
install_name_tool -rpath "/Library/Frameworks" "@executable_path" "$(TEMPORARY_FOLDER)/swiftlint"
rm -f "./portable_swiftlint.zip"
(cd "$(TEMPORARY_FOLDER)"; zip -yr - "swiftlint" "SwiftLintFramework.framework") > "./portable_swiftlint.zip"
(cd "$(TEMPORARY_FOLDER)"; zip -yr - "swiftlint" "SwiftLintFramework.framework" "LICENSE") > "./portable_swiftlint.zip"

package: installables
pkgbuild \
Expand Down Expand Up @@ -120,7 +120,8 @@ spm_clean_dist:

publish:
brew update && brew bump-formula-pr --tag=$(shell git describe --tags) --revision=$(shell git rev-parse HEAD) swiftlint
pod trunk push
pod trunk push SwiftLintFramework.podspec
pod trunk push SwiftLint.podspec

get_version:
@echo $(VERSION_STRING)
Expand Down
2 changes: 1 addition & 1 deletion SwiftLint.podspec
Expand Up @@ -3,7 +3,7 @@ Pod::Spec.new do |s|
s.version = `make get_version`
s.summary = 'A tool to enforce Swift style and conventions.'
s.homepage = 'https://github.com/realm/SwiftLint'
s.license = 'MIT'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'JP Simard' => 'jp@jpsim.com' }
s.source = { :http => "#{s.homepage}/releases/download/#{s.version}/portable_swiftlint.zip" }
s.preserve_paths = '*'
Expand Down

0 comments on commit 7abbd84

Please sign in to comment.