diff --git a/compiler/android-tests/android-module/build.gradle b/compiler/android-tests/android-module/build.gradle index 22d1ed98398..e85100443b6 100644 --- a/compiler/android-tests/android-module/build.gradle +++ b/compiler/android-tests/android-module/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta4' + classpath 'com.android.tools.build:gradle:3.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -22,7 +22,7 @@ repositories { android { compileSdkVersion 19 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.2" defaultConfig { applicationId "org.jetbrains.kotlin.android.tests" 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 1f89d8fdf59..188e0bf92b3 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 @@ -41,9 +41,9 @@ public class SDKDownloader { //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 SDK_TOOLS = "25.1.1"; - public static final String BUILD_TOOLS = "26.0.1"; + public static final String BUILD_TOOLS = "26.0.2"; private static final int ANDROID_VERSION = 19; - public static final String GRADLE_VERSION = "4.1"; + public static final String GRADLE_VERSION = "4.3"; public SDKDownloader(PathManager pathManager) { @@ -63,7 +63,7 @@ public class SDKDownloader { private void downloadAbi() { download("https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-" + ANDROID_VERSION + "_r03.zip", armImage); //Same for all platforms - download("https://dl.google.com/android/repository/sys-img/android/sysimg_x86-" + ANDROID_VERSION + "_r03.zip", x86Image); //Same for all platforms + download("https://dl.google.com/android/repository/sys-img/android/sysimg_x86-" + ANDROID_VERSION + "_r05.zip", x86Image); //Same for all platforms } public void downloadPlatformTools() { @@ -127,7 +127,7 @@ public class SDKDownloader { String buildToolsFolder = buildTools + BUILD_TOOLS + "/"; new File(buildToolsFolder).delete(); unzip(buildToolsZipPath, buildTools); - new File(buildTools + "/android-8.0.0").renameTo(new File(buildToolsFolder)); + new File(buildTools + "/android-8.1.0").renameTo(new File(buildToolsFolder)); } public void deleteAll() { 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 11359585c06..972ea81a785 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,6 +33,7 @@ public class PermissionManager { setExecPermissionForSimpleNamedFiles(new File(pathManager.getToolsFolderInAndroidSdk() + "/bin64")); setExecPermissionForSimpleNamedFiles(new File(pathManager.getBuildToolsFolderInAndroidSdk() + "/" + SDKDownloader.BUILD_TOOLS)); setExecPermissionForSimpleNamedFiles(new File(pathManager.getPlatformToolsFolderInAndroidSdk())); + setExecPermissionForSimpleNamedFiles(new File(pathManager.getToolsFolderInAndroidSdk() +"/qemu/linux-x86_64")); RunUtils.execute(generateChmodCmd(pathManager.getGradleBinFolder() + "/gradle")); } }