Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Swift tools version from 5.3 to 5.5 #206

Merged
merged 2 commits into from
Jun 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .buildkite/check-version-consistency.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
SRC_FILE=Sources/Model/ObjC/Constants/TracksConstants.m
PODSPEC_FILE=Automattic-Tracks-iOS.podspec

# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
gem install bundler

SOURCE_VERS=$(sed -n s/'^.* TracksLibraryVersion = @"\(.*\)";.*$'/'\1'/p $SRC_FILE)
POD_VERS=$(sed -n s/'^ *s.version *= \([^ ]*\).*$'/'\1'/p $PODSPEC_FILE | tr -d \'\")

Expand Down
20 changes: 17 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ common_params:
- &bash_cache automattic/bash-cache#v1.5.0: ~
# Common environment values to use with the `env` key.
env: &common_env
IMAGE_ID: xcode-12.5.1
IMAGE_ID: xcode-13.4.1

# This is the default pipeline – it will build and test the app
steps:
Expand All @@ -14,6 +14,9 @@ steps:
- label: "🧪 Build and Test iOS"
key: "test_ios"
command: |
# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
gem install bundler

# Build and test the pod twice if needed. This is necessary under Xcode 12 to avoid an error
# that occurs the first time after cleaning if one of your dependences uses a binary framework
# See https://bugs.swift.org/browse/SR-13803
Expand All @@ -29,6 +32,9 @@ steps:
- label: "🧪 Build and Test macOS"
key: "test_macos"
command: |
# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
gem install bundler

# Build and test the pod twice if needed. This is necessary under Xcode 12 to avoid an error
# that occurs the first time after cleaning if one of your dependences uses a binary framework
# See https://bugs.swift.org/browse/SR-13803
Expand All @@ -43,7 +49,11 @@ steps:
#################
- label: "🔬 Validating Podspec"
key: "validate"
command: "validate_podspec"
command: |
# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
gem install bundler

validate_podspec
env: *common_env
plugins: *common_plugins
artifact_paths: ".build/logs/*.log"
Expand All @@ -62,7 +72,11 @@ steps:
#################
- label: "🧹 Lint"
key: "lint"
command: "lint_pod"
command: |
# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
gem install bundler

lint_pod
env: *common_env
plugins: *common_plugins

Expand Down
4 changes: 4 additions & 0 deletions .buildkite/publish-pod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ PODSPEC_PATH="Automattic-Tracks-iOS.podspec"
SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK

echo "--- :rubygems: Setting up Gems"

# Workaround for https://github.com/Automattic/buildkite-ci/issues/79
gem install bundler

install_gems

echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.3
// swift-tools-version:5.5
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand Down