Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
bc2a4a64
Unverified
Commit
bc2a4a64
authored
Nov 05, 2020
by
Jenn Magder
Committed by
GitHub
Nov 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update CocoaPods recommended version to 1.9 (#69809)
parent
ed118925
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
20 deletions
+27
-20
Gemfile.lock
dev/ci/mac/Gemfile.lock
+24
-17
cocoapods.dart
packages/flutter_tools/lib/src/macos/cocoapods.dart
+1
-1
cocoapods_test.dart
...lutter_tools/test/general.shard/macos/cocoapods_test.dart
+2
-2
No files found.
dev/ci/mac/Gemfile.lock
View file @
bc2a4a64
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.
1
)
activesupport (4.2.11.
1
)
CFPropertyList (3.0.
2
)
activesupport (4.2.11.
3
)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.
1
)
algoliasearch (1.27.
5
)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.
8.4
)
cocoapods (1.
9.3
)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.
8.4
)
cocoapods-core (= 1.
9.3
)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
...
...
@@ -30,26 +30,31 @@ GEM
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.1
1.1
, < 2.0)
cocoapods-core (1.
8.4
)
xcodeproj (>= 1.1
4.0
, < 2.0)
cocoapods-core (1.
9.3
)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.
2.2
)
cocoapods-downloader (1.
4.0
)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.
4.1
)
cocoapods-trunk (1.
5.0
)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.
1
.0)
cocoapods-try (1.
2
.0)
colored2 (3.1.2)
concurrent-ruby (1.1.
5
)
concurrent-ruby (1.1.
7
)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.13.1)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
...
...
@@ -57,21 +62,23 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.1)
minitest (5.1
2
.2)
minitest (5.1
4
.2)
molinillo (0.6.6)
nanaimo (0.
2.6
)
nanaimo (0.
3.0
)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.4.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.1
3
.0)
xcodeproj (1.1
9
.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.
2.6
)
nanaimo (~> 0.
3.0
)
PLATFORMS
ruby
...
...
@@ -80,4 +87,4 @@ DEPENDENCIES
cocoapods
BUNDLED WITH
2.0
.2
2.1
.2
packages/flutter_tools/lib/src/macos/cocoapods.dart
View file @
bc2a4a64
...
...
@@ -98,7 +98,7 @@ class CocoaPods {
Future
<
String
>
_versionText
;
String
get
cocoaPodsMinimumVersion
=>
'1.6.0'
;
String
get
cocoaPodsRecommendedVersion
=>
'1.
8
.0'
;
String
get
cocoaPodsRecommendedVersion
=>
'1.
9
.0'
;
Future
<
bool
>
get
isInstalled
=>
_processUtils
.
exitsHappy
(<
String
>[
'which'
,
'pod'
]);
...
...
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file @
bc2a4a64
...
...
@@ -181,13 +181,13 @@ void main() {
testWithoutContext
(
'detects at recommended version'
,
()
async
{
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1.
8
.0'
);
pretendPodVersionIs
(
'1.
9
.0'
);
expect
(
await
cocoaPodsUnderTest
.
evaluateCocoaPodsInstallation
,
CocoaPodsStatus
.
recommended
);
});
testWithoutContext
(
'detects above recommended version'
,
()
async
{
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1.
8
.1'
);
pretendPodVersionIs
(
'1.
9
.1'
);
expect
(
await
cocoaPodsUnderTest
.
evaluateCocoaPodsInstallation
,
CocoaPodsStatus
.
recommended
);
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment