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
793e6a48
Unverified
Commit
793e6a48
authored
May 10, 2020
by
Luke Cheng
Committed by
GitHub
May 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
typo fix on the FLUTTER_STORAGE_BASE_URL usage (#56685)
parent
9d4b0cb8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
17 deletions
+17
-17
android_engine_dependency_proxy_test.dart
...celab/bin/tasks/android_engine_dependency_proxy_test.dart
+1
-1
aar_init_script.gradle
packages/flutter_tools/gradle/aar_init_script.gradle
+2
-2
flutter.gradle
packages/flutter_tools/gradle/flutter.gradle
+2
-2
resolve_dependencies.gradle
packages/flutter_tools/gradle/resolve_dependencies.gradle
+2
-2
gradle.dart
packages/flutter_tools/lib/src/android/gradle.dart
+2
-2
gradle_test.dart
...flutter_tools/test/general.shard/android/gradle_test.dart
+8
-8
No files found.
dev/devicelab/bin/tasks/android_engine_dependency_proxy_test.dart
View file @
793e6a48
...
@@ -58,7 +58,7 @@ task printEngineMavenUrl() {
...
@@ -58,7 +58,7 @@ task printEngineMavenUrl() {
gradlewExecutable
,
gradlewExecutable
,
<
String
>[
'printEngineMavenUrl'
,
'-q'
],
<
String
>[
'printEngineMavenUrl'
,
'-q'
],
environment:
<
String
,
String
>{
environment:
<
String
,
String
>{
'FLUTTER_STORAGE_BASE_URL'
:
'my.special.proxy'
,
'FLUTTER_STORAGE_BASE_URL'
:
'
https://
my.special.proxy'
,
}
}
);
);
...
...
packages/flutter_tools/gradle/aar_init_script.gradle
View file @
793e6a48
...
@@ -53,12 +53,12 @@ void configureProject(Project project, String outputDir) {
...
@@ -53,12 +53,12 @@ void configureProject(Project project, String outputDir) {
"See: https://github.com/flutter/flutter/issues/40866"
)
"See: https://github.com/flutter/flutter/issues/40866"
)
}
}
String
storageUrl
=
System
.
getenv
(
'FLUTTER_STORAGE_BASE_URL'
)
?:
"storage.googleapis.com"
String
storageUrl
=
System
.
getenv
(
'FLUTTER_STORAGE_BASE_URL'
)
?:
"
https://
storage.googleapis.com"
// This is a Flutter plugin project. Plugin projects don't apply the Flutter Gradle plugin,
// This is a Flutter plugin project. Plugin projects don't apply the Flutter Gradle plugin,
// as a result, add the dependency on the embedding.
// as a result, add the dependency on the embedding.
project
.
repositories
{
project
.
repositories
{
maven
{
maven
{
url
"
https://
$storageUrl/download.flutter.io"
url
"$storageUrl/download.flutter.io"
}
}
}
}
String
engineVersion
=
Paths
.
get
(
getFlutterRoot
(
project
),
"bin"
,
"internal"
,
"engine.version"
)
String
engineVersion
=
Paths
.
get
(
getFlutterRoot
(
project
),
"bin"
,
"internal"
,
"engine.version"
)
...
...
packages/flutter_tools/gradle/flutter.gradle
View file @
793e6a48
...
@@ -41,7 +41,7 @@ android {
...
@@ -41,7 +41,7 @@ android {
apply
plugin:
FlutterPlugin
apply
plugin:
FlutterPlugin
class
FlutterPlugin
implements
Plugin
<
Project
>
{
class
FlutterPlugin
implements
Plugin
<
Project
>
{
private
static
final
String
DEFAULT_MAVEN_HOST
=
"storage.googleapis.com"
;
private
static
final
String
DEFAULT_MAVEN_HOST
=
"
https://
storage.googleapis.com"
;
// The platforms that can be passed to the `--Ptarget-platform` flag.
// The platforms that can be passed to the `--Ptarget-platform` flag.
private
static
final
String
PLATFORM_ARM32
=
"android-arm"
;
private
static
final
String
PLATFORM_ARM32
=
"android-arm"
;
...
@@ -203,7 +203,7 @@ class FlutterPlugin implements Plugin<Project> {
...
@@ -203,7 +203,7 @@ class FlutterPlugin implements Plugin<Project> {
String
hostedRepository
=
System
.
env
.
FLUTTER_STORAGE_BASE_URL
?:
DEFAULT_MAVEN_HOST
String
hostedRepository
=
System
.
env
.
FLUTTER_STORAGE_BASE_URL
?:
DEFAULT_MAVEN_HOST
String
repository
=
useLocalEngine
()
String
repository
=
useLocalEngine
()
?
project
.
property
(
'local-engine-repo'
)
?
project
.
property
(
'local-engine-repo'
)
:
"
https://
$hostedRepository/download.flutter.io"
:
"$hostedRepository/download.flutter.io"
project
.
rootProject
.
allprojects
{
project
.
rootProject
.
allprojects
{
repositories
{
repositories
{
maven
{
maven
{
...
...
packages/flutter_tools/gradle/resolve_dependencies.gradle
View file @
793e6a48
...
@@ -14,13 +14,13 @@
...
@@ -14,13 +14,13 @@
import
java.nio.file.Paths
import
java.nio.file.Paths
String
storageUrl
=
System
.
getenv
(
'FLUTTER_STORAGE_BASE_URL'
)
?:
"storage.googleapis.com"
String
storageUrl
=
System
.
getenv
(
'FLUTTER_STORAGE_BASE_URL'
)
?:
"
https://
storage.googleapis.com"
repositories
{
repositories
{
google
()
google
()
jcenter
()
jcenter
()
maven
{
maven
{
url
"
https://
$storageUrl/download.flutter.io"
url
"$storageUrl/download.flutter.io"
}
}
}
}
...
...
packages/flutter_tools/lib/src/android/gradle.dart
View file @
793e6a48
...
@@ -664,13 +664,13 @@ void printHowToConsumeAar({
...
@@ -664,13 +664,13 @@ void printHowToConsumeAar({
1. Open
${fileSystem.path.join('<host>', 'app', 'build.gradle')}
1. Open
${fileSystem.path.join('<host>', 'app', 'build.gradle')}
2. Ensure you have the repositories configured, otherwise add them:
2. Ensure you have the repositories configured, otherwise add them:
String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"
String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "
https://
storage.googleapis.com"
repositories {
repositories {
maven {
maven {
url '
$
{
repoDirectory
.
path
}
'
url '
$
{
repoDirectory
.
path
}
'
}
}
maven {
maven {
url '
https:
//
\$storageUrl/download.flutter.io'
url '
\
$storageUrl
/
download
.
flutter
.
io
'
}
}
}
}
...
...
packages/flutter_tools/test/general.shard/android/gradle_test.dart
View file @
793e6a48
...
@@ -2324,13 +2324,13 @@ plugin1=${plugin1.path}
...
@@ -2324,13 +2324,13 @@ plugin1=${plugin1.path}
' 1. Open <host>/app/build.gradle
\n
'
' 1. Open <host>/app/build.gradle
\n
'
' 2. Ensure you have the repositories configured, otherwise add them:
\n
'
' 2. Ensure you have the repositories configured, otherwise add them:
\n
'
'
\n
'
'
\n
'
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"
\n
'
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "
https://
storage.googleapis.com"
\n
'
' repositories {
\n
'
' repositories {
\n
'
' maven {
\n
'
' maven {
\n
'
" url 'build/'
\n
"
" url 'build/'
\n
"
' }
\n
'
' }
\n
'
' maven {
\n
'
' maven {
\n
'
" url '
https://
\
$storageUrl
/download.flutter.io'
\n
"
" url '
\
$storageUrl
/download.flutter.io'
\n
"
' }
\n
'
' }
\n
'
' }
\n
'
' }
\n
'
'
\n
'
'
\n
'
...
@@ -2375,13 +2375,13 @@ plugin1=${plugin1.path}
...
@@ -2375,13 +2375,13 @@ plugin1=${plugin1.path}
' 1. Open <host>/app/build.gradle
\n
'
' 1. Open <host>/app/build.gradle
\n
'
' 2. Ensure you have the repositories configured, otherwise add them:
\n
'
' 2. Ensure you have the repositories configured, otherwise add them:
\n
'
'
\n
'
'
\n
'
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"
\n
'
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "
https://
storage.googleapis.com"
\n
'
' repositories {
\n
'
' repositories {
\n
'
' maven {
\n
'
' maven {
\n
'
" url 'build/'
\n
"
" url 'build/'
\n
"
' }
\n
'
' }
\n
'
' maven {
\n
'
' maven {
\n
'
" url '
https://
\
$storageUrl
/download.flutter.io'
\n
"
" url '
\
$storageUrl
/download.flutter.io'
\n
"
' }
\n
'
' }
\n
'
' }
\n
'
' }
\n
'
'
\n
'
'
\n
'
...
@@ -2413,13 +2413,13 @@ plugin1=${plugin1.path}
...
@@ -2413,13 +2413,13 @@ plugin1=${plugin1.path}
' 1. Open <host>/app/build.gradle
\n
'
' 1. Open <host>/app/build.gradle
\n
'
' 2. Ensure you have the repositories configured, otherwise add them:
\n
'
' 2. Ensure you have the repositories configured, otherwise add them:
\n
'
'
\n
'
'
\n
'
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"
\n
'
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "
https://
storage.googleapis.com"
\n
'
' repositories {
\n
'
' repositories {
\n
'
' maven {
\n
'
' maven {
\n
'
" url 'build/'
\n
"
" url 'build/'
\n
"
' }
\n
'
' }
\n
'
' maven {
\n
'
' maven {
\n
'
" url '
https://
\
$storageUrl
/download.flutter.io'
\n
"
" url '
\
$storageUrl
/download.flutter.io'
\n
"
' }
\n
'
' }
\n
'
' }
\n
'
' }
\n
'
'
\n
'
'
\n
'
...
@@ -2452,13 +2452,13 @@ plugin1=${plugin1.path}
...
@@ -2452,13 +2452,13 @@ plugin1=${plugin1.path}
' 1. Open <host>/app/build.gradle
\n
'
' 1. Open <host>/app/build.gradle
\n
'
' 2. Ensure you have the repositories configured, otherwise add them:
\n
'
' 2. Ensure you have the repositories configured, otherwise add them:
\n
'
'
\n
'
'
\n
'
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"
\n
'
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "
https://
storage.googleapis.com"
\n
'
' repositories {
\n
'
' repositories {
\n
'
' maven {
\n
'
' maven {
\n
'
" url 'build/'
\n
"
" url 'build/'
\n
"
' }
\n
'
' }
\n
'
' maven {
\n
'
' maven {
\n
'
" url '
https://
\
$storageUrl
/download.flutter.io'
\n
"
" url '
\
$storageUrl
/download.flutter.io'
\n
"
' }
\n
'
' }
\n
'
' }
\n
'
' }
\n
'
'
\n
'
'
\n
'
...
...
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