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
004f90f8
Unverified
Commit
004f90f8
authored
Jul 28, 2020
by
Chris Yang
Committed by
GitHub
Jul 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove iOS folder (#61561)
parent
5281a9aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
24 deletions
+6
-24
template.dart
packages/flutter_tools/lib/src/template.dart
+4
-3
create_test.dart
...tter_tools/test/commands.shard/permeable/create_test.dart
+2
-21
No files found.
packages/flutter_tools/lib/src/template.dart
View file @
004f90f8
...
...
@@ -129,9 +129,10 @@ class Template {
return
null
;
}
// TODO(cyanglaz): do not add iOS folder by default when 1.20.0 is released.
// Also need to update the flutter SDK min constraint in the pubspec.yaml to 1.20.0.
// https://github.com/flutter/flutter/issues/59787
final
bool
ios
=
context
[
'ios'
]
as
bool
;
if
(
relativeDestinationPath
.
contains
(
'ios'
)
&&
!
ios
)
{
return
null
;
}
// Only build a web project if explicitly asked.
final
bool
web
=
context
[
'web'
]
as
bool
;
...
...
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View file @
004f90f8
...
...
@@ -1533,7 +1533,7 @@ void main() {
// TODO(cyanglaz): no-op iOS folder should be removed after 1.20.0 release
// https://github.com/flutter/flutter/issues/59787
expect
(
projectDir
.
childDirectory
(
'ios'
).
existsSync
(),
tru
e
);
expect
(
projectDir
.
childDirectory
(
'ios'
).
existsSync
(),
fals
e
);
expect
(
projectDir
.
childDirectory
(
'android'
).
existsSync
(),
false
);
expect
(
projectDir
.
childDirectory
(
'web'
).
existsSync
(),
false
);
expect
(
projectDir
.
childDirectory
(
'linux'
).
existsSync
(),
false
);
...
...
@@ -1542,7 +1542,7 @@ void main() {
// TODO(cyanglaz): no-op iOS folder should be removed after 1.20.0 release
// https://github.com/flutter/flutter/issues/59787
expect
(
projectDir
.
childDirectory
(
'example'
).
childDirectory
(
'ios'
).
existsSync
(),
tru
e
);
expect
(
projectDir
.
childDirectory
(
'example'
).
childDirectory
(
'ios'
).
existsSync
(),
fals
e
);
expect
(
projectDir
.
childDirectory
(
'example'
).
childDirectory
(
'android'
).
existsSync
(),
false
);
expect
(
projectDir
.
childDirectory
(
'example'
).
childDirectory
(
'web'
).
existsSync
(),
false
);
expect
(
projectDir
.
childDirectory
(
'example'
).
childDirectory
(
'linux'
).
existsSync
(),
false
);
...
...
@@ -1557,25 +1557,6 @@ void main() {
});
// TODO(cyanglaz): no-op iOS folder should be removed after 1.20.0 release
// https://github.com/flutter/flutter/issues/59787
testUsingContext
(
'create an empty plugin contains a no-op ios folder, but no pubspec entry.'
,
()
async
{
Cache
.
flutterRoot
=
'../..'
;
when
(
mockFlutterVersion
.
frameworkRevision
).
thenReturn
(
frameworkRevision
);
when
(
mockFlutterVersion
.
channel
).
thenReturn
(
frameworkChannel
);
final
CreateCommand
command
=
CreateCommand
();
final
CommandRunner
<
void
>
runner
=
createTestCommandRunner
(
command
);
await
runner
.
run
(<
String
>[
'create'
,
'--no-pub'
,
'--template=plugin'
,
projectDir
.
path
]);
expect
(
projectDir
.
childDirectory
(
'ios'
).
existsSync
(),
true
);
expect
(
projectDir
.
childDirectory
(
'example'
).
childDirectory
(
'ios'
).
existsSync
(),
true
);
validatePubspecForPlugin
(
projectDir:
projectDir
.
absolute
.
path
,
expectedPlatforms:
const
<
String
>[
'some_platform'
],
pluginClass:
'somePluginClass'
,
unexpectedPlatforms:
<
String
>[
'ios'
]);
});
testUsingContext
(
'plugin supports ios if requested'
,
()
async
{
Cache
.
flutterRoot
=
'../..'
;
when
(
mockFlutterVersion
.
frameworkRevision
).
thenReturn
(
frameworkRevision
);
...
...
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