Skip to content

Commit 793e6a4

Browse files
chengluchenglu
authored
typo fix on the FLUTTER_STORAGE_BASE_URL usage (flutter#56685)
1 parent 9d4b0cb commit 793e6a4

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎dev/devicelab/bin/tasks/android_engine_dependency_proxy_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ task printEngineMavenUrl() {
5858
gradlewExecutable,
5959
<String>['printEngineMavenUrl', '-q'],
6060
environment: <String, String>{
61-
'FLUTTER_STORAGE_BASE_URL': 'my.special.proxy',
61+
'FLUTTER_STORAGE_BASE_URL': 'https://my.special.proxy',
6262
}
6363
);
6464

‎packages/flutter_tools/gradle/aar_init_script.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ void configureProject(Project project, String outputDir) {
5353
"See: https://github.com/flutter/flutter/issues/40866")
5454
}
5555

56-
String storageUrl = System.getenv('FLUTTER_STORAGE_BASE_URL') ?: "storage.googleapis.com"
56+
String storageUrl = System.getenv('FLUTTER_STORAGE_BASE_URL') ?: "https://storage.googleapis.com"
5757
// This is a Flutter plugin project. Plugin projects don't apply the Flutter Gradle plugin,
5858
// as a result, add the dependency on the embedding.
5959
project.repositories {
6060
maven {
61-
url "https://$storageUrl/download.flutter.io"
61+
url "$storageUrl/download.flutter.io"
6262
}
6363
}
6464
String engineVersion = Paths.get(getFlutterRoot(project), "bin", "internal", "engine.version")

‎packages/flutter_tools/gradle/flutter.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ android {
4141
apply plugin: FlutterPlugin
4242

4343
class FlutterPlugin implements Plugin<Project> {
44-
private static final String DEFAULT_MAVEN_HOST = "storage.googleapis.com";
44+
private static final String DEFAULT_MAVEN_HOST = "https://storage.googleapis.com";
4545

4646
// The platforms that can be passed to the `--Ptarget-platform` flag.
4747
private static final String PLATFORM_ARM32 = "android-arm";
@@ -203,7 +203,7 @@ class FlutterPlugin implements Plugin<Project> {
203203
String hostedRepository = System.env.FLUTTER_STORAGE_BASE_URL ?: DEFAULT_MAVEN_HOST
204204
String repository = useLocalEngine()
205205
? project.property('local-engine-repo')
206-
: "https://$hostedRepository/download.flutter.io"
206+
: "$hostedRepository/download.flutter.io"
207207
project.rootProject.allprojects {
208208
repositories {
209209
maven {

‎packages/flutter_tools/gradle/resolve_dependencies.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
import java.nio.file.Paths
1616

17-
String storageUrl = System.getenv('FLUTTER_STORAGE_BASE_URL') ?: "storage.googleapis.com"
17+
String storageUrl = System.getenv('FLUTTER_STORAGE_BASE_URL') ?: "https://storage.googleapis.com"
1818

1919
repositories {
2020
google()
2121
jcenter()
2222
maven {
23-
url "https://$storageUrl/download.flutter.io"
23+
url "$storageUrl/download.flutter.io"
2424
}
2525
}
2626

‎packages/flutter_tools/lib/src/android/gradle.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -664,13 +664,13 @@ void printHowToConsumeAar({
664664
1. Open ${fileSystem.path.join('<host>', 'app', 'build.gradle')}
665665
2. Ensure you have the repositories configured, otherwise add them:
666666
667-
String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"
667+
String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"
668668
repositories {
669669
maven {
670670
url '${repoDirectory.path}'
671671
}
672672
maven {
673-
url 'https://\$storageUrl/download.flutter.io'
673+
url '\$storageUrl/download.flutter.io'
674674
}
675675
}
676676

‎packages/flutter_tools/test/general.shard/android/gradle_test.dart

+8-8
Original file line numberDiff line numberDiff line change
@@ -2324,13 +2324,13 @@ plugin1=${plugin1.path}
23242324
' 1. Open <host>/app/build.gradle\n'
23252325
' 2. Ensure you have the repositories configured, otherwise add them:\n'
23262326
'\n'
2327-
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"\n'
2327+
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"\n'
23282328
' repositories {\n'
23292329
' maven {\n'
23302330
" url 'build/'\n"
23312331
' }\n'
23322332
' maven {\n'
2333-
" url 'https://\$storageUrl/download.flutter.io'\n"
2333+
" url '\$storageUrl/download.flutter.io'\n"
23342334
' }\n'
23352335
' }\n'
23362336
'\n'
@@ -2375,13 +2375,13 @@ plugin1=${plugin1.path}
23752375
' 1. Open <host>/app/build.gradle\n'
23762376
' 2. Ensure you have the repositories configured, otherwise add them:\n'
23772377
'\n'
2378-
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"\n'
2378+
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"\n'
23792379
' repositories {\n'
23802380
' maven {\n'
23812381
" url 'build/'\n"
23822382
' }\n'
23832383
' maven {\n'
2384-
" url 'https://\$storageUrl/download.flutter.io'\n"
2384+
" url '\$storageUrl/download.flutter.io'\n"
23852385
' }\n'
23862386
' }\n'
23872387
'\n'
@@ -2413,13 +2413,13 @@ plugin1=${plugin1.path}
24132413
' 1. Open <host>/app/build.gradle\n'
24142414
' 2. Ensure you have the repositories configured, otherwise add them:\n'
24152415
'\n'
2416-
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"\n'
2416+
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"\n'
24172417
' repositories {\n'
24182418
' maven {\n'
24192419
" url 'build/'\n"
24202420
' }\n'
24212421
' maven {\n'
2422-
" url 'https://\$storageUrl/download.flutter.io'\n"
2422+
" url '\$storageUrl/download.flutter.io'\n"
24232423
' }\n'
24242424
' }\n'
24252425
'\n'
@@ -2452,13 +2452,13 @@ plugin1=${plugin1.path}
24522452
' 1. Open <host>/app/build.gradle\n'
24532453
' 2. Ensure you have the repositories configured, otherwise add them:\n'
24542454
'\n'
2455-
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "storage.googleapis.com"\n'
2455+
' String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com"\n'
24562456
' repositories {\n'
24572457
' maven {\n'
24582458
" url 'build/'\n"
24592459
' }\n'
24602460
' maven {\n'
2461-
" url 'https://\$storageUrl/download.flutter.io'\n"
2461+
" url '\$storageUrl/download.flutter.io'\n"
24622462
' }\n'
24632463
' }\n'
24642464
'\n'

0 commit comments

Comments
 (0)