Skip to content

Commit

Permalink
Merge branch 'issue/xcode_13' into issue/xcode_13_change_buildkite_image
Browse files Browse the repository at this point in the history
  • Loading branch information
leandroalonso authored Nov 1, 2021
2 parents fc376fd + a7ecaed commit 518508f
Show file tree
Hide file tree
Showing 367 changed files with 14,679 additions and 3,618 deletions.
2 changes: 1 addition & 1 deletion .buildkite/commands/build-for-testing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ bundle exec fastlane build_for_testing

echo "--- :arrow_up: Upload Build Products"
tar -cf build-products.tar DerivedData/Build/Products/
buildkite-agent artifact upload build-products.tar
upload_artifact build-products.tar
2 changes: 1 addition & 1 deletion .buildkite/commands/run-ui-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ IOS_VERSION=$3
echo "Running $TEST_NAME on $DEVICE for iOS $IOS_VERSION"

echo "--- 📦 Downloading Build Artifacts"
buildkite-agent artifact download build-products.tar .
download_artifact build-products.tar
tar -xf build-products.tar

echo "--- :wrench: Fixing VM"
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/commands/run-unit-tests.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash -eu

echo "--- 📦 Downloading Build Artifacts"
buildkite-agent artifact download build-products.tar .
download_artifact build-products.tar
tar -xf build-products.tar

# Temporary fix until we're on the Xcode 13.1 VM
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
common_params:
# Common plugin settings to use with the `plugins` key.
- &common_plugins
- automattic/bash-cache#v1.5.0
- automattic/bash-cache#v1.6.0
- automattic/git-s3-cache#v1.1.0:
bucket: "a8c-repo-mirrors"
repo: "wordpress-mobile/wordpress-ios/"
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ GEM
trainer
xcodeproj
xctest_list (>= 1.2.1)
fastlane-plugin-wpmreleasetoolkit (1.4.0)
fastlane-plugin-wpmreleasetoolkit (2.1.0)
activesupport (~> 5)
bigdecimal (~> 1.4)
chroma (= 0.2.0)
Expand All @@ -176,7 +176,7 @@ GEM
octokit (~> 4.18)
parallel (~> 1.14)
progress_bar (~> 1.3)
rake (~> 12.3)
rake (>= 12.3, < 14.0)
rake-compiler (~> 1.0)
ffi (1.15.0)
fourflusher (2.3.1)
Expand Down Expand Up @@ -246,25 +246,25 @@ GEM
nap (1.1.0)
naturally (2.2.1)
netrc (0.11.0)
nokogiri (1.12.4)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
racc (~> 1.4)
octokit (4.21.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
oj (3.13.4)
oj (3.13.9)
optimist (3.0.1)
options (2.3.2)
optparse (0.1.1)
os (1.1.1)
parallel (1.20.1)
parallel (1.21.0)
plist (3.6.0)
progress_bar (1.3.3)
highline (>= 1.6, < 3)
options (~> 2.3.0)
public_suffix (4.0.6)
racc (1.5.2)
rake (12.3.3)
racc (1.6.0)
rake (13.0.6)
rake-compiler (1.1.1)
rake
rchardet (1.8.0)
Expand Down Expand Up @@ -340,7 +340,7 @@ DEPENDENCIES
fastlane-plugin-appcenter (~> 1.8)
fastlane-plugin-sentry
fastlane-plugin-test_center
fastlane-plugin-wpmreleasetoolkit (~> 1.4)
fastlane-plugin-wpmreleasetoolkit (~> 2.1)
octokit (~> 4.0)
rake
rmagick (~> 3.2.0)
Expand Down
6 changes: 6 additions & 0 deletions MIGRATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
This file documents changes in the data model. Please explain any changes to the
data model as well as any custom migrations.

## WordPress 134

@dvdchr 2021-10-14

- `ReaderPost`: added `receivesCommentNotifications` attribute. (required, default `false`, `Boolean`)

## WordPress 132

@momo-ozawa 2021-08-19
Expand Down
14 changes: 7 additions & 7 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ workspace 'WordPress.xcworkspace'
## ===================================
##
def wordpress_shared
pod 'WordPressShared', '~> 1.16.0'
pod 'WordPressShared', '~> 1.16.2'
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :tag => ''
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
#pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit => ''
Expand All @@ -35,21 +35,21 @@ def aztec
#pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => ''
#pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :tag => ''
#pod 'WordPress-Editor-iOS', :path => '../AztecEditor-iOS'
pod 'WordPress-Editor-iOS', '~> 1.19.4'
pod 'WordPress-Editor-iOS', '~> 1.19.5'
end

def wordpress_ui
pod 'WordPressUI', '~> 1.12.2-beta.1'
pod 'WordPressUI', '~> 1.12.2'
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :tag => ''
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :branch => ''
#pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS', :commit => ''
#pod 'WordPressUI', :path => '../WordPressUI-iOS'
end

def wordpress_kit
pod 'WordPressKit', '~> 4.42.0'
pod 'WordPressKit', '~> 4.42.3-beta.3'
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'feature/domain-renewal-expiry'
# pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
# pod 'WordPressKit', :path => '../WordPressKit-iOS'
end
Expand Down Expand Up @@ -166,7 +166,7 @@ abstract_target 'Apps' do
## Gutenberg (React Native)
## =====================
##
gutenberg :tag => 'v1.62.0'
gutenberg :tag => 'v1.65.0'

## Third party libraries
## =====================
Expand Down Expand Up @@ -215,7 +215,7 @@ abstract_target 'Apps' do

pod 'Gridicons', '~> 1.1.0'

pod 'WordPressAuthenticator', '~> 1.42.0'
pod 'WordPressAuthenticator', '~> 1.42.1'
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
Expand Down
Loading

0 comments on commit 518508f

Please sign in to comment.