azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated android test configuration

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-01-18 15:11:49 +01:00
parent da1b8a02ed
commit 818773b7e2
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/android-module/build.gradle
+4 -2
View File
@@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.1.0' classpath 'com.android.tools.build:gradle:2.2.3'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@@ -64,7 +64,9 @@ android {
dexOptions { dexOptions {
dexInProcess false dexInProcess false
javaMaxHeapSize "600m" javaMaxHeapSize "700m"
//default is 4 and Total Memory = maxProcessCount * javaMaxHeapSize
maxProcessCount 2
} }
} }
compiler/android-tests/src/org/jetbrains/kotlin/android/tests/PathManager.java
+3 -1
View File
@@ -16,6 +16,8 @@
package org.jetbrains.kotlin.android.tests; package org.jetbrains.kotlin.android.tests;
import org.jetbrains.kotlin.android.tests.download.SDKDownloader;
import java.io.File; import java.io.File;
public class PathManager { public class PathManager {
@@ -75,7 +77,7 @@ public class PathManager {
} }
public String getGradleBinFolder() { public String getGradleBinFolder() {
return getDependenciesRoot() + "/gradle-2.12/bin"; return getDependenciesRoot() + "/gradle-" + SDKDownloader.GRADLE_VERSION + "/bin";
} }
public String getRootForDownload() { public String getRootForDownload() {
compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
+2 -1
View File
@@ -43,6 +43,7 @@ public class SDKDownloader {
private static final String SDK_TOOLS = "25.1.1"; private static final String SDK_TOOLS = "25.1.1";
public static final String BUILD_TOOLS = "23.0.3"; public static final String BUILD_TOOLS = "23.0.3";
private static final int ANDROID_VERSION = 19; private static final int ANDROID_VERSION = 19;
public static final String GRADLE_VERSION = "2.14.1";
public SDKDownloader(PathManager pathManager) { public SDKDownloader(PathManager pathManager) {
@@ -78,7 +79,7 @@ public class SDKDownloader {
} }
public void downloadGradle() { public void downloadGradle() {
download("https://services.gradle.org/distributions/gradle-2.12-bin.zip", gradleZipPath); download("https://services.gradle.org/distributions/gradle-" + GRADLE_VERSION + "-bin.zip", gradleZipPath);
} }
private static String getDownloadUrl(String prefix) { private static String getDownloadUrl(String prefix) {