Use https to access cloud storage bucket
Bug: 148609216
Change-Id: I3cbfe6cb14d98ca600f9f9b61687001af6e4895e
diff --git a/build.gradle b/build.gradle
index 1a9edec..d4f2a0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
buildscript {
repositories {
maven {
- url 'http://storage.googleapis.com/r8-deps/maven_mirror/'
+ url 'https://storage.googleapis.com/r8-deps/maven_mirror/'
}
mavenCentral()
gradlePluginPortal()
@@ -54,7 +54,7 @@
repositories {
maven {
- url 'http://storage.googleapis.com/r8-deps/maven_mirror/'
+ url 'https://storage.googleapis.com/r8-deps/maven_mirror/'
}
google()
mavenCentral()
diff --git a/tools/archive.py b/tools/archive.py
index c24babb..8a9cf8c 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -92,11 +92,11 @@
return GetStorageDestination('gs://', version_or_path, file_name, is_master)
def GetUrl(version_or_path, file_name, is_master):
- return GetStorageDestination('http://storage.googleapis.com/',
+ return GetStorageDestination('https://storage.googleapis.com/',
version_or_path, file_name, is_master)
def GetMavenUrl(is_master):
- return GetVersionDestination('http://storage.googleapis.com/', '', is_master)
+ return GetVersionDestination('https://storage.googleapis.com/', '', is_master)
def SetRLimitToMax():
(soft, hard) = resource.getrlimit(resource.RLIMIT_NOFILE)
diff --git a/tools/archive_desugar_jdk_libs.py b/tools/archive_desugar_jdk_libs.py
index 295e006..7714362 100755
--- a/tools/archive_desugar_jdk_libs.py
+++ b/tools/archive_desugar_jdk_libs.py
@@ -15,7 +15,7 @@
#
# The first two are the raw jar file and the maven compatible zip file. The
# third is the raw jar file placed and named so that the URL
-# http://storage.googleapis.com/r8-releases/raw can be treated as a maven
+# https://storage.googleapis.com/r8-releases/raw can be treated as a maven
# repository to fetch the artifact com.android.tools:desugar_jdk_libs:1.0.0
import archive
@@ -75,7 +75,7 @@
else:
utils.upload_file_to_cloud_storage(file_name, destination)
print('File available at: %s' %
- destination.replace('gs://', 'http://storage.googleapis.com/', 1))
+ destination.replace('gs://', 'https://storage.googleapis.com/', 1))
def Main(argv):
diff --git a/tools/r8_release.py b/tools/r8_release.py
index f74fd57..a9e66237 100755
--- a/tools/r8_release.py
+++ b/tools/r8_release.py
@@ -285,7 +285,7 @@
def download_file(version, file, dst):
urllib.urlretrieve(
- ('http://storage.googleapis.com/r8-releases/raw/%s/%s' % (version, file)),
+ ('https://storage.googleapis.com/r8-releases/raw/%s/%s' % (version, file)),
dst)
diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index 8b188f5..cf26883 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -1305,7 +1305,7 @@
if options.hash:
# Download r8-<hash>.jar from
- # http://storage.googleapis.com/r8-releases/raw/.
+ # https://storage.googleapis.com/r8-releases/raw/.
target = 'r8-{}.jar'.format(options.hash)
update_prebuilds_in_android.download_hash(
temp_dir, 'com/android/tools/r8/' + options.hash, target)
@@ -1314,7 +1314,7 @@
quiet=options.quiet)
elif options.version:
# Download r8-<version>.jar from
- # http://storage.googleapis.com/r8-releases/raw/.
+ # https://storage.googleapis.com/r8-releases/raw/.
target = 'r8-{}.jar'.format(options.version)
update_prebuilds_in_android.download_version(
temp_dir, 'com/android/tools/r8/' + options.version, target)
diff --git a/tools/test.py b/tools/test.py
index 9925dea..9359394 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -150,7 +150,7 @@
u_dir = uuid.uuid4()
destination = 'gs://%s/%s' % (BUCKET, u_dir)
utils.upload_dir_to_cloud_storage(upload_dir, destination, is_html=True)
- url = 'http://storage.googleapis.com/%s/%s/test/index.html' % (BUCKET, u_dir)
+ url = 'https://storage.googleapis.com/%s/%s/test/index.html' % (BUCKET, u_dir)
print 'Test results available at: %s' % url
print '@@@STEP_LINK@Test failures@%s@@@' % url
diff --git a/tools/update_prebuilds_in_android.py b/tools/update_prebuilds_in_android.py
index ae1ed2c..f3a0923 100755
--- a/tools/update_prebuilds_in_android.py
+++ b/tools/update_prebuilds_in_android.py
@@ -12,7 +12,7 @@
import utils
import urllib
-BUILD_ROOT = "http://storage.googleapis.com/r8-releases/raw/"
+BUILD_ROOT = "https://storage.googleapis.com/r8-releases/raw/"
MASTER_BUILD_ROOT = "%smaster/" % BUILD_ROOT
JAR_TARGETS_MAP = {
