From c0e5023632745a78e29a9359af08c5adfaaf4a04 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Sun, 20 Jan 2019 17:13:03 -0500 Subject: [PATCH] Better deployment of Jazzy and Pods --- .travis.yml | 46 ++++++++++++++++++++++++++++++++-------------- Path.swift.podspec | 19 ------------------- README.md | 2 +- 3 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 Path.swift.podspec diff --git a/.travis.yml b/.travis.yml index 08c0ffa..d4988e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,29 +44,28 @@ jobs: install: eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" script: swift test - - <<: *xcodebuild - stage: deploy + - stage: deploy name: Jazzy before_install: | - cat << EOF > .jazzy.yml + cat << EOF > .jazzy.yaml + module: Path + module_version: $TRAVIS_TAG custom_categories: - name: Path children: - Path - /(_:_:) + xcodebuild_arguments: + - UseModernBuildSystem=NO + output: output + github_url: https://github.com/mxcl/Path.swift EOF - touch Contents.md - install: gem install jazzy + install: | + gem install jazzy + swift package generate-xcodeproj script: | - jazzy \ - --no-hide-documentation-coverage \ - --theme fullwidth \ - --output output \ - --readme Contents.md \ - --root-url https://mxcl.github.io/Path.swift/ \ - --github_url https://github.com/mxcl/Path.swift \ - --module Path \ - --module-version $TRAVIS_TAG + jazzy + rm -rf output/docsets deploy: provider: pages skip-cleanup: true @@ -77,5 +76,24 @@ jobs: - stage: deploy name: CocoaPods + before_install: | + cat << EOF > Path.swift.podspec + Pod::Spec.new do |s| + s.name = 'Path.swift' + s.version = '$TRAVIS_TAG' + s.summary = 'Delightful, robust file-pathing functions' + s.homepage = 'https://github.com/mxcl/Path.swift' + s.license = { :type => 'Unlicense', :file => 'LICENSE.md' } + s.author = { 'mxcl' => 'mxcl@me.com' } + s.source = { :git => 'https://github.com/mxcl/Path.swift.git', :tag => s.version.to_s } + s.social_media_url = 'https://twitter.com/mxcl' + s.osx.deployment_target = '10.10' + s.ios.deployment_target = '8.0' + s.tvos.deployment_target = '10.0' + s.watchos.deployment_target = '3.0' + s.source_files = 'Sources/*' + s.swift_version = "4.2" + end + EOF install: gem install cocoapods --pre script: pod trunk push --allow-warnings diff --git a/Path.swift.podspec b/Path.swift.podspec deleted file mode 100644 index 8bb1869..0000000 --- a/Path.swift.podspec +++ /dev/null @@ -1,19 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'Path.swift' - s.version = '0.4.1' - s.summary = 'Delightful, robust file-pathing functions' - s.homepage = 'https://github.com/mxcl/Path.swift' - s.license = { :type => 'Unlicense', :file => 'LICENSE.md' } - s.author = { 'mxcl' => 'mxcl@me.com' } - s.source = { :git => 'https://github.com/mxcl/Path.swift.git', :tag => s.version.to_s } - s.social_media_url = 'https://twitter.com/mxcl' - - s.osx.deployment_target = '10.10' - s.ios.deployment_target = '8.0' - s.tvos.deployment_target = '10.0' - s.watchos.deployment_target = '3.0' - - s.source_files = 'Sources/*' - - s.swift_version = "4.2" -end diff --git a/README.md b/README.md index 935a18b..173d81b 100644 --- a/README.md +++ b/README.md @@ -208,4 +208,4 @@ https://codebasesaga.com/canopy/ [badge-platforms]: https://img.shields.io/badge/platforms-macOS%20%7C%20Linux%20%7C%20iOS%20%7C%20tvOS%20%7C%20watchOS-lightgrey.svg [badge-languages]: https://img.shields.io/badge/swift-4.2-orange.svg -[online API documentation]: https://mxcl.github.io/Path.swift/ +[online API documentation]: https://mxcl.github.io/Path.swift/Structs/Path.html