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
6b14558a
Unverified
Commit
6b14558a
authored
Feb 18, 2021
by
Jonah Williams
Committed by
GitHub
Feb 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] remove global usage of flutterUsage from gradle (#76330)
parent
050d49ae
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
425 additions
and
262 deletions
+425
-262
gradle.dart
packages/flutter_tools/lib/src/android/gradle.dart
+37
-30
application_package.dart
packages/flutter_tools/lib/src/application_package.dart
+1
-1
context_runner.dart
packages/flutter_tools/lib/src/context_runner.dart
+1
-0
android_gradle_builder_test.dart
...st/general.shard/android/android_gradle_builder_test.dart
+19
-0
gradle_find_bundle_test.dart
...s/test/general.shard/android/gradle_find_bundle_test.dart
+366
-0
gradle_test.dart
...flutter_tools/test/general.shard/android/gradle_test.dart
+1
-231
No files found.
packages/flutter_tools/lib/src/android/gradle.dart
View file @
6b14558a
This diff is collapsed.
Click to expand it.
packages/flutter_tools/lib/src/application_package.dart
View file @
6b14558a
...
...
@@ -221,7 +221,7 @@ class AndroidApk extends ApplicationPackage {
File
apkFile
;
if
(
androidProject
.
isUsingGradle
)
{
apkFile
=
await
getGradleAppOut
(
androidProject
);
apkFile
=
await
getGradleAppOut
(
androidProject
,
globals
.
flutterUsage
);
if
(
apkFile
.
existsSync
())
{
// Grab information from the .apk. The gradle build script might alter
// the application Id, so we need to look at what was actually built.
...
...
packages/flutter_tools/lib/src/context_runner.dart
View file @
6b14558a
...
...
@@ -84,6 +84,7 @@ Future<T> runInContext<T>(
processManager:
globals
.
processManager
,
fileSystem:
globals
.
fs
,
artifacts:
globals
.
artifacts
,
usage:
globals
.
flutterUsage
,
),
AndroidLicenseValidator:
()
=>
AndroidLicenseValidator
(
operatingSystemUtils:
globals
.
os
,
...
...
packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
View file @
6b14558a
...
...
@@ -81,6 +81,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -172,6 +173,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -278,6 +280,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -369,6 +372,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
FakeCommand
(
command:
const
<
String
>[
...
...
@@ -432,6 +436,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -534,6 +539,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -631,6 +637,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -746,6 +753,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -813,6 +821,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -880,6 +889,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -940,6 +950,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(
localEngine:
'out/android_arm'
),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -1018,6 +1029,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(
localEngine:
'out/android_arm64'
),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -1096,6 +1108,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(
localEngine:
'out/android_x86'
),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -1174,6 +1187,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(
localEngine:
'out/android_x64'
),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -1252,6 +1266,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -1311,6 +1326,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(
localEngine:
'out/android_arm'
),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -1400,6 +1416,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(
localEngine:
'out/android_arm64'
),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -1489,6 +1506,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(
localEngine:
'out/android_x86'
),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
@@ -1578,6 +1596,7 @@ void main() {
processManager:
processManager
,
fileSystem:
fileSystem
,
artifacts:
Artifacts
.
test
(
localEngine:
'out/android_x64'
),
usage:
testUsage
,
);
processManager
.
addCommand
(
const
FakeCommand
(
command:
<
String
>[
...
...
packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart
0 → 100644
View file @
6b14558a
This diff is collapsed.
Click to expand it.
packages/flutter_tools/test/general.shard/android/gradle_test.dart
View file @
6b14558a
This diff is collapsed.
Click to expand it.
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