typo fix on the FLUTTER_STORAGE_BASE_URL usage (#56685)
diff --git a/dev/devicelab/bin/tasks/android_engine_dependency_proxy_test.dart b/dev/devicelab/bin/tasks/android_engine_dependency_proxy_test.dart index c5297de..e5e1665 100644 --- a/dev/devicelab/bin/tasks/android_engine_dependency_proxy_test.dart +++ b/dev/devicelab/bin/tasks/android_engine_dependency_proxy_test.dart
@@ -58,7 +58,7 @@ gradlewExecutable, <String>['printEngineMavenUrl', '-q'], environment: <String, String>{ - 'FLUTTER_STORAGE_BASE_URL': 'my.special.proxy', + 'FLUTTER_STORAGE_BASE_URL': 'https://my.special.proxy', } );
diff --git a/packages/flutter_tools/gradle/aar_init_script.gradle b/packages/flutter_tools/gradle/aar_init_script.gradle index 003979f..06b0f62 100644 --- a/packages/flutter_tools/gradle/aar_init_script.gradle +++ b/packages/flutter_tools/gradle/aar_init_script.gradle
@@ -53,12 +53,12 @@ "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, // as a result, add the dependency on the embedding. project.repositories { maven { - url "https://$storageUrl/download.flutter.io" + url "$storageUrl/download.flutter.io" } } String engineVersion = Paths.get(getFlutterRoot(project), "bin", "internal", "engine.version")
diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle index 115aeae..3c223e9 100644 --- a/packages/flutter_tools/gradle/flutter.gradle +++ b/packages/flutter_tools/gradle/flutter.gradle
@@ -41,7 +41,7 @@ apply plugin: FlutterPlugin 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. private static final String PLATFORM_ARM32 = "android-arm"; @@ -203,7 +203,7 @@ String hostedRepository = System.env.FLUTTER_STORAGE_BASE_URL ?: DEFAULT_MAVEN_HOST String repository = useLocalEngine() ? project.property('local-engine-repo') - : "https://$hostedRepository/download.flutter.io" + : "$hostedRepository/download.flutter.io" project.rootProject.allprojects { repositories { maven {
diff --git a/packages/flutter_tools/gradle/resolve_dependencies.gradle b/packages/flutter_tools/gradle/resolve_dependencies.gradle index 99407d5..508fb49 100644 --- a/packages/flutter_tools/gradle/resolve_dependencies.gradle +++ b/packages/flutter_tools/gradle/resolve_dependencies.gradle
@@ -14,13 +14,13 @@ 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 { google() jcenter() maven { - url "https://$storageUrl/download.flutter.io" + url "$storageUrl/download.flutter.io" } }
diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart index 09a517d..c0a39f7 100644 --- a/packages/flutter_tools/lib/src/android/gradle.dart +++ b/packages/flutter_tools/lib/src/android/gradle.dart
@@ -664,13 +664,13 @@ 1. Open ${fileSystem.path.join('<host>', 'app', 'build.gradle')} 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 { maven { url '${repoDirectory.path}' } maven { - url 'https://\$storageUrl/download.flutter.io' + url '\$storageUrl/download.flutter.io' } }
diff --git a/packages/flutter_tools/test/general.shard/android/gradle_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_test.dart index 7d76f82..e094fa9 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_test.dart
@@ -2324,13 +2324,13 @@ ' 1. Open <host>/app/build.gradle\n' ' 2. Ensure you have the repositories configured, otherwise add them:\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' ' maven {\n' " url 'build/'\n" ' }\n' ' maven {\n' - " url 'https://\$storageUrl/download.flutter.io'\n" + " url '\$storageUrl/download.flutter.io'\n" ' }\n' ' }\n' '\n' @@ -2375,13 +2375,13 @@ ' 1. Open <host>/app/build.gradle\n' ' 2. Ensure you have the repositories configured, otherwise add them:\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' ' maven {\n' " url 'build/'\n" ' }\n' ' maven {\n' - " url 'https://\$storageUrl/download.flutter.io'\n" + " url '\$storageUrl/download.flutter.io'\n" ' }\n' ' }\n' '\n' @@ -2413,13 +2413,13 @@ ' 1. Open <host>/app/build.gradle\n' ' 2. Ensure you have the repositories configured, otherwise add them:\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' ' maven {\n' " url 'build/'\n" ' }\n' ' maven {\n' - " url 'https://\$storageUrl/download.flutter.io'\n" + " url '\$storageUrl/download.flutter.io'\n" ' }\n' ' }\n' '\n' @@ -2452,13 +2452,13 @@ ' 1. Open <host>/app/build.gradle\n' ' 2. Ensure you have the repositories configured, otherwise add them:\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' ' maven {\n' " url 'build/'\n" ' }\n' ' maven {\n' - " url 'https://\$storageUrl/download.flutter.io'\n" + " url '\$storageUrl/download.flutter.io'\n" ' }\n' ' }\n' '\n'