From 896429a959fa96d1e98f1dc4b0c1274ae0c8526b Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 27 Apr 2016 18:18:01 +0300 Subject: [PATCH] Switch to gradle from gradle wrapper, use https instead of http to download files --- .../kotlin/android/tests/PathManager.java | 4 ++++ .../android/tests/download/SDKDownloader.java | 22 ++++++++++++++----- .../android/tests/gradle/GradleRunner.java | 5 ++--- .../android/tests/run/PermissionManager.java | 2 +- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java index 2e9063f807b..d93e34a0fa3 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java @@ -74,6 +74,10 @@ public class PathManager { return rootFolder + "/android.tests.dependencies"; } + public String getGradleBinFolder() { + return getDependenciesRoot() + "/gradle-2.12/bin"; + } + public String getRootForDownload() { return getDependenciesRoot() + "/download"; } diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java index 6208a03560f..99c0004eec0 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java @@ -34,6 +34,7 @@ public class SDKDownloader { private final String platformToolsZipPath; private final String skdToolsZipPath; private final String buildToolsZipPath; + private final String gradleZipPath; private final PathManager pathManager; @@ -51,27 +52,32 @@ public class SDKDownloader { platformToolsZipPath = pathManager.getRootForDownload() + "/platform-tools.zip"; skdToolsZipPath = pathManager.getRootForDownload() + "/tools.zip"; buildToolsZipPath = pathManager.getRootForDownload() + "/build-tools.zip"; + gradleZipPath = pathManager.getRootForDownload() + "/gradle.zip"; } public void downloadPlatform() { - download("http://dl-ssl.google.com/android/repository/android-" + ANDROID_VERSION + "_r05.zip", platformZipPath); //Same for all platforms + download("https://dl-ssl.google.com/android/repository/android-" + ANDROID_VERSION + "_r05.zip", platformZipPath); //Same for all platforms } private void downloadAbi() { - download("http://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-" + ANDROID_VERSION + "_r04.zip", armImage); //Same for all platforms - download("http://dl.google.com/android/repository/sys-img/android/sysimg_x86-" + ANDROID_VERSION + "_r02.zip", x86Image); //Same for all platforms + download("https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-" + ANDROID_VERSION + "_r04.zip", armImage); //Same for all platforms + download("https://dl.google.com/android/repository/sys-img/android/sysimg_x86-" + ANDROID_VERSION + "_r02.zip", x86Image); //Same for all platforms } public void downloadPlatformTools() { - download(getDownloadUrl("http://dl-ssl.google.com/android/repository/platform-tools_r" + PLATFORM_TOOLS), platformToolsZipPath); + download(getDownloadUrl("https://dl-ssl.google.com/android/repository/platform-tools_r" + PLATFORM_TOOLS), platformToolsZipPath); } public void downloadSdkTools() { - download(getDownloadUrl("http://dl.google.com/android/repository/tools_r" + SDK_TOOLS), skdToolsZipPath); + download(getDownloadUrl("https://dl.google.com/android/repository/tools_r" + SDK_TOOLS), skdToolsZipPath); } public void downloadBuildTools() { - download(getDownloadUrl("http://dl.google.com/android/repository/build-tools_r" + BUILD_TOOLS), buildToolsZipPath); + download(getDownloadUrl("https://dl.google.com/android/repository/build-tools_r" + BUILD_TOOLS), buildToolsZipPath); + } + + public void downloadGradle() { + download("https://services.gradle.org/distributions/gradle-2.12-bin.zip", gradleZipPath); } private static String getDownloadUrl(String prefix) { @@ -97,6 +103,7 @@ public class SDKDownloader { downloadPlatform(); downloadPlatformTools(); downloadBuildTools(); + downloadGradle(); } @@ -111,6 +118,8 @@ public class SDKDownloader { unzip(platformToolsZipPath, androidSdkRoot); unzip(skdToolsZipPath, androidSdkRoot); + unzip(gradleZipPath, pathManager.getDependenciesRoot()); + //BUILD TOOLS String buildTools = androidSdkRoot + "/build-tools/"; String buildToolsFolder = buildTools + BUILD_TOOLS + "/"; @@ -126,6 +135,7 @@ public class SDKDownloader { delete(buildToolsZipPath); delete(armImage); delete(x86Image); + delete(gradleZipPath); } private static void download(String urlString, String output) { diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java index 68e24def104..9b172d3ebb0 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.android.tests.OutputUtils; import org.jetbrains.kotlin.android.tests.PathManager; import org.jetbrains.kotlin.android.tests.run.RunResult; import org.jetbrains.kotlin.android.tests.run.RunUtils; -import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.util.ArrayList; import java.util.List; @@ -32,8 +31,8 @@ public class GradleRunner { public GradleRunner(PathManager pathManager) { listOfCommands = new ArrayList(); - String cmdName = SystemInfo.isWindows ? "gradlew.bat" : "gradlew"; - listOfCommands.add(pathManager.getTmpFolder() + "/" + cmdName); + String cmdName = SystemInfo.isWindows ? "gradle.bat" : "gradle"; + listOfCommands.add(pathManager.getGradleBinFolder() + "/" + cmdName); listOfCommands.add("--build-file"); listOfCommands.add(pathManager.getTmpFolder() + "/build.gradle"); } diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java index 48b1fe20477..5c5dad482fa 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/PermissionManager.java @@ -33,7 +33,7 @@ public class PermissionManager { setExecPermissionForSimpleNamedFiles(new File(pathManager.getToolsFolderInAndroidSdk())); setExecPermissionForSimpleNamedFiles(new File(pathManager.getBuildToolsFolderInAndroidSdk() + "/" + SDKDownloader.BUILD_TOOLS)); setExecPermissionForSimpleNamedFiles(new File(pathManager.getPlatformToolsFolderInAndroidSdk())); - RunUtils.execute(generateChmodCmd(pathManager.getTmpFolder() + "/gradlew")); + RunUtils.execute(generateChmodCmd(pathManager.getGradleBinFolder() + "/gradle")); } }