Skip to content
This repository was archived by the owner on Jun 19, 2025. It is now read-only.

Commit 2fb25e4

Browse files
committed
Merge branch 'develop' into release/1.6.0
2 parents 422d45a + b0a4395 commit 2fb25e4

File tree

5 files changed

+23
-12
lines changed

5 files changed

+23
-12
lines changed

.circleci/config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: 2.1
22

33
orbs:
4-
# This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs
5-
ios: wordpress-mobile/ios@0.0.35
4+
# Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs
5+
ios: wordpress-mobile/ios@1.0
66

77
workflows:
88
test_and_validate:
@@ -15,14 +15,18 @@ workflows:
1515
scheme: WPMediaPicker-Example
1616
device: iPhone 11
1717
ios-version: "13.0"
18+
bundle-install: true
19+
pod-install: true
1820
- ios/validate-podspec:
1921
name: Validate Podspec
2022
xcode-version: "11.0"
2123
podspec-path: WPMediaPicker.podspec
24+
bundle-install: true
2225
- ios/publish-podspec:
2326
name: Publish to Trunk
2427
xcode-version: "11.0"
2528
podspec-path: WPMediaPicker.podspec
29+
bundle-install: true
2630
post-to-slack: true
2731
filters:
2832
tags:

Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
source 'https://github.com/CocoaPods/Specs.git'
1+
source 'https://cdn.cocoapods.org/'
22
platform :ios, '11.0'
33
target 'WPMediaPicker' do
44
pod "WPMediaPicker", :path => "../"

Example/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ EXTERNAL SOURCES:
1111
SPEC CHECKSUMS:
1212
WPMediaPicker: e5d28197da6b467d4e5975d64a49255977e39455
1313

14-
PODFILE CHECKSUM: 02a24c94627582ae16b486b76dc047a7f773dcc4
14+
PODFILE CHECKSUM: 6b0e391139d3864c72fde997a1418dbfe9bf5126
1515

1616
COCOAPODS: 1.8.4

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source 'https://rubygems.org' do
2-
gem 'cocoapods', '1.7.5'
2+
gem 'cocoapods', '~> 1.8.0'
33
end

Gemfile.lock

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,21 @@ GEM
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10+
algoliasearch (1.27.1)
11+
httpclient (~> 2.8, >= 2.8.3)
12+
json (>= 1.5.1)
1013
atomos (0.1.3)
1114
claide (1.0.3)
12-
cocoapods (1.7.5)
15+
cocoapods (1.8.4)
1316
activesupport (>= 4.0.2, < 5)
1417
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.7.5)
18+
cocoapods-core (= 1.8.4)
1619
cocoapods-deintegrate (>= 1.0.3, < 2.0)
1720
cocoapods-downloader (>= 1.2.2, < 2.0)
1821
cocoapods-plugins (>= 1.0.0, < 2.0)
1922
cocoapods-search (>= 1.0.0, < 2.0)
2023
cocoapods-stats (>= 1.0.0, < 2.0)
21-
cocoapods-trunk (>= 1.3.1, < 2.0)
24+
cocoapods-trunk (>= 1.4.0, < 2.0)
2225
cocoapods-try (>= 1.1.0, < 2.0)
2326
colored2 (~> 3.1)
2427
escape (~> 0.0.4)
@@ -27,9 +30,11 @@ GEM
2730
molinillo (~> 0.6.6)
2831
nap (~> 1.0)
2932
ruby-macho (~> 1.4)
30-
xcodeproj (>= 1.10.0, < 2.0)
31-
cocoapods-core (1.7.5)
33+
xcodeproj (>= 1.11.1, < 2.0)
34+
cocoapods-core (1.8.4)
3235
activesupport (>= 4.0.2, < 6)
36+
algoliasearch (~> 1.0)
37+
concurrent-ruby (~> 1.1)
3338
fuzzy_match (~> 2.0.4)
3439
nap (~> 1.0)
3540
cocoapods-deintegrate (1.0.4)
@@ -48,8 +53,10 @@ GEM
4853
fourflusher (2.3.1)
4954
fuzzy_match (2.0.4)
5055
gh_inspector (1.1.3)
56+
httpclient (2.8.3)
5157
i18n (0.9.5)
5258
concurrent-ruby (~> 1.0)
59+
json (2.2.0)
5360
minitest (5.12.2)
5461
molinillo (0.6.6)
5562
nanaimo (0.2.6)
@@ -59,7 +66,7 @@ GEM
5966
thread_safe (0.3.6)
6067
tzinfo (1.2.5)
6168
thread_safe (~> 0.1)
62-
xcodeproj (1.12.0)
69+
xcodeproj (1.13.0)
6370
CFPropertyList (>= 2.3.3, < 4.0)
6471
atomos (~> 0.1.3)
6572
claide (>= 1.0.2, < 2.0)
@@ -70,7 +77,7 @@ PLATFORMS
7077
ruby
7178

7279
DEPENDENCIES
73-
cocoapods (= 1.7.5)!
80+
cocoapods (~> 1.8.0)!
7481

7582
BUNDLED WITH
7683
2.0.2

0 commit comments

Comments
 (0)