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
320d2cff
Unverified
Commit
320d2cff
authored
Feb 24, 2022
by
Jenn Magder
Committed by
GitHub
Feb 24, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase recommended CocoaPods version to 1.11 (#98621)
parent
8d5903f7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
cocoapods.dart
packages/flutter_tools/lib/src/macos/cocoapods.dart
+1
-1
cocoapods_test.dart
...lutter_tools/test/general.shard/macos/cocoapods_test.dart
+13
-13
cocoapods_validator_test.dart
...ls/test/general.shard/macos/cocoapods_validator_test.dart
+1
-1
No files found.
packages/flutter_tools/lib/src/macos/cocoapods.dart
View file @
320d2cff
...
@@ -69,7 +69,7 @@ enum CocoaPodsStatus {
...
@@ -69,7 +69,7 @@ enum CocoaPodsStatus {
}
}
const
Version
cocoaPodsMinimumVersion
=
Version
.
withText
(
1
,
9
,
0
,
'1.9.0'
);
const
Version
cocoaPodsMinimumVersion
=
Version
.
withText
(
1
,
9
,
0
,
'1.9.0'
);
const
Version
cocoaPodsRecommendedVersion
=
Version
.
withText
(
1
,
1
0
,
0
,
'1.10
.0'
);
const
Version
cocoaPodsRecommendedVersion
=
Version
.
withText
(
1
,
1
1
,
0
,
'1.11
.0'
);
/// Cocoapods is a dependency management solution for iOS and macOS applications.
/// Cocoapods is a dependency management solution for iOS and macOS applications.
///
///
...
...
packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file @
320d2cff
...
@@ -165,13 +165,13 @@ void main() {
...
@@ -165,13 +165,13 @@ void main() {
testWithoutContext
(
'detects at recommended version'
,
()
async
{
testWithoutContext
(
'detects at recommended version'
,
()
async
{
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1.1
0
.0'
);
pretendPodVersionIs
(
'1.1
1
.0'
);
expect
(
await
cocoaPodsUnderTest
.
evaluateCocoaPodsInstallation
,
CocoaPodsStatus
.
recommended
);
expect
(
await
cocoaPodsUnderTest
.
evaluateCocoaPodsInstallation
,
CocoaPodsStatus
.
recommended
);
});
});
testWithoutContext
(
'detects above recommended version'
,
()
async
{
testWithoutContext
(
'detects above recommended version'
,
()
async
{
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1.1
0
.1'
);
pretendPodVersionIs
(
'1.1
1
.1'
);
expect
(
await
cocoaPodsUnderTest
.
evaluateCocoaPodsInstallation
,
CocoaPodsStatus
.
recommended
);
expect
(
await
cocoaPodsUnderTest
.
evaluateCocoaPodsInstallation
,
CocoaPodsStatus
.
recommended
);
});
});
});
});
...
@@ -410,7 +410,7 @@ void main() {
...
@@ -410,7 +410,7 @@ void main() {
testUsingContext
(
'prints warning if macOS Podfile parses .flutter-plugins'
,
()
async
{
testUsingContext
(
'prints warning if macOS Podfile parses .flutter-plugins'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
fakeProcessManager
.
addCommands
(
const
<
FakeCommand
>[
fakeProcessManager
.
addCommands
(
const
<
FakeCommand
>[
FakeCommand
(
FakeCommand
(
command:
<
String
>[
'pod'
,
'install'
,
'--verbose'
],
command:
<
String
>[
'pod'
,
'install'
,
'--verbose'
],
...
@@ -449,7 +449,7 @@ void main() {
...
@@ -449,7 +449,7 @@ void main() {
testUsingContext
(
'throws, if specs repo is outdated.'
,
()
async
{
testUsingContext
(
'throws, if specs repo is outdated.'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
fileSystem
.
file
(
fileSystem
.
path
.
join
(
'project'
,
'ios'
,
'Podfile'
))
fileSystem
.
file
(
fileSystem
.
path
.
join
(
'project'
,
'ios'
,
'Podfile'
))
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -499,7 +499,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -499,7 +499,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'ffi
$errorName
failure on ARM macOS prompts gem install'
,
()
async
{
testUsingContext
(
'ffi
$errorName
failure on ARM macOS prompts gem install'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
fileSystem
.
file
(
fileSystem
.
path
.
join
(
'project'
,
'ios'
,
'Podfile'
))
fileSystem
.
file
(
fileSystem
.
path
.
join
(
'project'
,
'ios'
,
'Podfile'
))
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -542,7 +542,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -542,7 +542,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'ffi failure on x86 macOS does not prompt gem install'
,
()
async
{
testUsingContext
(
'ffi failure on x86 macOS does not prompt gem install'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
fileSystem
.
file
(
fileSystem
.
path
.
join
(
'project'
,
'ios'
,
'Podfile'
))
fileSystem
.
file
(
fileSystem
.
path
.
join
(
'project'
,
'ios'
,
'Podfile'
))
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -586,7 +586,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -586,7 +586,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'run pod install, if Podfile.lock is missing'
,
()
async
{
testUsingContext
(
'run pod install, if Podfile.lock is missing'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
projectUnderTest
.
ios
.
podfile
projectUnderTest
.
ios
.
podfile
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -613,7 +613,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -613,7 +613,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'runs iOS pod install, if Manifest.lock is missing'
,
()
async
{
testUsingContext
(
'runs iOS pod install, if Manifest.lock is missing'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
projectUnderTest
.
ios
.
podfile
projectUnderTest
.
ios
.
podfile
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -642,7 +642,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -642,7 +642,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'runs macOS pod install, if Manifest.lock is missing'
,
()
async
{
testUsingContext
(
'runs macOS pod install, if Manifest.lock is missing'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
projectUnderTest
.
macos
.
podfile
projectUnderTest
.
macos
.
podfile
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -671,7 +671,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -671,7 +671,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'runs pod install, if Manifest.lock different from Podspec.lock'
,
()
async
{
testUsingContext
(
'runs pod install, if Manifest.lock different from Podspec.lock'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
projectUnderTest
.
ios
.
podfile
projectUnderTest
.
ios
.
podfile
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -703,7 +703,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -703,7 +703,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'runs pod install, if flutter framework changed'
,
()
async
{
testUsingContext
(
'runs pod install, if flutter framework changed'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
projectUnderTest
.
ios
.
podfile
projectUnderTest
.
ios
.
podfile
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -735,7 +735,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -735,7 +735,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'runs pod install, if Podfile.lock is older than Podfile'
,
()
async
{
testUsingContext
(
'runs pod install, if Podfile.lock is older than Podfile'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
projectUnderTest
.
ios
.
podfile
projectUnderTest
.
ios
.
podfile
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
@@ -789,7 +789,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
...
@@ -789,7 +789,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext
(
'a failed pod install deletes Pods/Manifest.lock'
,
()
async
{
testUsingContext
(
'a failed pod install deletes Pods/Manifest.lock'
,
()
async
{
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
final
FlutterProject
projectUnderTest
=
setupProjectUnderTest
();
pretendPodIsInstalled
();
pretendPodIsInstalled
();
pretendPodVersionIs
(
'1
.1
0.0'
);
pretendPodVersionIs
(
'1
00.
0.0'
);
projectUnderTest
.
ios
.
podfile
projectUnderTest
.
ios
.
podfile
..
createSync
()
..
createSync
()
..
writeAsStringSync
(
'Existing Podfile'
);
..
writeAsStringSync
(
'Existing Podfile'
);
...
...
packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
View file @
320d2cff
...
@@ -40,7 +40,7 @@ void main() {
...
@@ -40,7 +40,7 @@ void main() {
final
ValidationMessage
message
=
result
.
messages
.
first
;
final
ValidationMessage
message
=
result
.
messages
.
first
;
expect
(
message
.
type
,
ValidationMessageType
.
hint
);
expect
(
message
.
type
,
ValidationMessageType
.
hint
);
expect
(
message
.
message
,
contains
(
'CocoaPods
$currentVersion
out of date'
));
expect
(
message
.
message
,
contains
(
'CocoaPods
$currentVersion
out of date'
));
expect
(
message
.
message
,
contains
(
'(1.1
0
.0 is recommended)'
));
expect
(
message
.
message
,
contains
(
'(1.1
1
.0 is 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