diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt index fc0969b5be3..36b30e987a1 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt @@ -255,7 +255,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test - @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+") + @PluginTargetVersions(gradleVersion = "5.0+", pluginVersion = "1.3.30+") fun testAndroidDependencyOnMPP() { configureByFiles() createProjectSubFile( @@ -267,7 +267,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin checkProjectStructure { module("project") module("app") { - libraryDependency("Gradle: android-android-26", DependencyScope.COMPILE) libraryDependency("Gradle: android.arch.core:common:1.1.0@jar", DependencyScope.COMPILE) libraryDependency("Gradle: android.arch.core:runtime:1.1.0@aar", DependencyScope.COMPILE) libraryDependency("Gradle: android.arch.lifecycle:common:1.1.0@jar", DependencyScope.COMPILE) @@ -428,7 +427,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin @Test - @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+") + @PluginTargetVersions(gradleVersion = "5.0+", pluginVersion = "1.3.50+") fun testSingleAndroidTarget() { configureByFiles() importProject() @@ -613,7 +612,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } @Test - @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+") + @PluginTargetVersions(gradleVersion = "5.0+", pluginVersion = "1.3.20+") fun testDetectAndroidSources() { configureByFiles() createProjectSubFile( diff --git a/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/app/build.gradle b/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/app/build.gradle index 3493d770543..aabb12d9287 100644 --- a/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/app/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/app/build.gradle @@ -5,11 +5,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 26 + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "jetbrains.org.myapplication" minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle b/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle index f2eb5f1049c..5eb542b03fa 100644 --- a/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/androidDependencyOnMPP/build.gradle @@ -4,7 +4,7 @@ buildscript { {{kotlin_plugin_repositories}} } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.5.2' classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") {{extraPluginDependencies}} } diff --git a/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle b/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle index ed73af4ff07..91174ade8da 100644 --- a/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.5.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" {{extraPluginDependencies}} } diff --git a/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/multiplatformb/build.gradle b/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/multiplatformb/build.gradle index 7982df9d045..80844543cea 100644 --- a/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/multiplatformb/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/detectAndroidSources/multiplatformb/build.gradle @@ -5,10 +5,11 @@ plugins { apply plugin: 'com.android.library' android { - compileSdkVersion 26 + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" diff --git a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/app/build.gradle b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/app/build.gradle index b4a0dc91415..5ec8f280332 100644 --- a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/app/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/app/build.gradle @@ -18,6 +18,7 @@ apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId 'org.jetbrains.kotlin.mpp_app_android' minSdkVersion 15 diff --git a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/build.gradle b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/build.gradle index 97d1d5c6896..79470556692 100644 --- a/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/build.gradle +++ b/idea/testData/gradle/newMultiplatformImport/singleAndroidTarget/build.gradle @@ -3,7 +3,7 @@ buildscript { {{kotlin_plugin_repositories}} } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.2' } } repositories {