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

Update android test configuration

Browse Source
This commit is contained in:
Mikhael Bogdanov
2017-09-04 15:41:14 +02:00
parent 81a1bf3319
commit 71663afbfe
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/android-module/build.gradle
+6 -3
View File
@@ -3,9 +3,11 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:3.0.0-beta4'
// 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
@@ -15,11 +17,12 @@ apply plugin: 'com.android.application'
repositories { repositories {
jcenter() jcenter()
google()
} }
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion "23.0.3" buildToolsVersion "26.0.1"
defaultConfig { defaultConfig {
applicationId "org.jetbrains.kotlin.android.tests" applicationId "org.jetbrains.kotlin.android.tests"
@@ -64,7 +67,7 @@ android {
dexOptions { dexOptions {
dexInProcess false dexInProcess false
javaMaxHeapSize "300m" javaMaxHeapSize "600m"
//default is 4 and Total Memory = maxProcessCount * javaMaxHeapSize //default is 4 and Total Memory = maxProcessCount * javaMaxHeapSize
maxProcessCount 1 maxProcessCount 1
additionalParameters "--debug" additionalParameters "--debug"
compiler/android-tests/android-module/gradle.properties
+3 -1
View File
@@ -1,2 +1,4 @@
#don't try to download android specific tools within gradle: licence acceptance will be required #don't try to download android specific tools within gradle: licence acceptance will be required
android.builder.sdkDownload=false android.builder.sdkDownload=false
android.enableAapt2=false
android.enableD8=false
compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
+7 -7
View File
@@ -41,19 +41,19 @@ public class SDKDownloader {
//NOTE: PLATFORM_TOOLS 23.1.0 requires only 64 bit build agents //NOTE: PLATFORM_TOOLS 23.1.0 requires only 64 bit build agents
private static final String PLATFORM_TOOLS = "23.0.1"; private static final String PLATFORM_TOOLS = "23.0.1";
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 = "26.0.1";
private static final int ANDROID_VERSION = 19; private static final int ANDROID_VERSION = 19;
public static final String GRADLE_VERSION = "2.14.1"; public static final String GRADLE_VERSION = "4.1";
public SDKDownloader(PathManager pathManager) { public SDKDownloader(PathManager pathManager) {
this.pathManager = pathManager; this.pathManager = pathManager;
platformZipPath = pathManager.getRootForDownload() + "/platforms.zip"; platformZipPath = pathManager.getRootForDownload() + "/platform" + ANDROID_VERSION + ".zip";
armImage = pathManager.getRootForDownload() + "/arm-image.zip"; armImage = pathManager.getRootForDownload() + "/arm-image.zip";
x86Image = pathManager.getRootForDownload() + "/x86-image.zip"; x86Image = pathManager.getRootForDownload() + "/x86-image.zip";
platformToolsZipPath = pathManager.getRootForDownload() + "/platform-tools.zip"; platformToolsZipPath = pathManager.getRootForDownload() + "/platform-tools" + PLATFORM_TOOLS + ".zip";
skdToolsZipPath = pathManager.getRootForDownload() + "/tools.zip"; skdToolsZipPath = pathManager.getRootForDownload() + "/tools" + SDK_TOOLS + ".zip";
buildToolsZipPath = pathManager.getRootForDownload() + "/build-tools.zip"; buildToolsZipPath = pathManager.getRootForDownload() + "/build-tools" + BUILD_TOOLS + ".zip";
gradleZipPath = pathManager.getRootForDownload() + "/gradle" + GRADLE_VERSION + ".zip"; gradleZipPath = pathManager.getRootForDownload() + "/gradle" + GRADLE_VERSION + ".zip";
} }
@@ -127,7 +127,7 @@ public class SDKDownloader {
String buildToolsFolder = buildTools + BUILD_TOOLS + "/"; String buildToolsFolder = buildTools + BUILD_TOOLS + "/";
new File(buildToolsFolder).delete(); new File(buildToolsFolder).delete();
unzip(buildToolsZipPath, buildTools); unzip(buildToolsZipPath, buildTools);
new File(buildTools + "/android-6.0").renameTo(new File(buildToolsFolder)); new File(buildTools + "/android-8.0.0").renameTo(new File(buildToolsFolder));
} }
public void deleteAll() { public void deleteAll() {
compiler/android-tests/src/org/jetbrains/kotlin/android/tests/gradle/GradleRunner.java
+1
View File
@@ -33,6 +33,7 @@ public class GradleRunner {
listOfCommands = new ArrayList<>(); listOfCommands = new ArrayList<>();
String cmdName = SystemInfo.isWindows ? "gradle.bat" : "gradle"; String cmdName = SystemInfo.isWindows ? "gradle.bat" : "gradle";
listOfCommands.add(pathManager.getGradleBinFolder() + "/" + cmdName); listOfCommands.add(pathManager.getGradleBinFolder() + "/" + cmdName);
listOfCommands.add("--no-daemon");
listOfCommands.add("--build-file"); listOfCommands.add("--build-file");
listOfCommands.add(pathManager.getTmpFolder() + "/build.gradle"); listOfCommands.add(pathManager.getTmpFolder() + "/build.gradle");
} }
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
+1
View File
@@ -122,6 +122,7 @@ public class SpecialFiles {
// KT-8120 // KT-8120
excludedFiles.add("closureOfInnerLocalClass.kt"); excludedFiles.add("closureOfInnerLocalClass.kt");
excludedFiles.add("closureWithSelfInstantiation.kt"); excludedFiles.add("closureWithSelfInstantiation.kt");
excludedFiles.add("quotedClassName.kt");
} }
private SpecialFiles() { private SpecialFiles() {