Fix android import tests

This commit is contained in:
Andrey Uskov
2020-05-24 20:51:02 +03:00
parent 351d706e0d
commit c7a53e4435
7 changed files with 13 additions and 11 deletions
@@ -255,7 +255,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
} }
@Test @Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+") @PluginTargetVersions(gradleVersion = "5.0+", pluginVersion = "1.3.30+")
fun testAndroidDependencyOnMPP() { fun testAndroidDependencyOnMPP() {
configureByFiles() configureByFiles()
createProjectSubFile( createProjectSubFile(
@@ -267,7 +267,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
checkProjectStructure { checkProjectStructure {
module("project") module("project")
module("app") { 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:common:1.1.0@jar", DependencyScope.COMPILE)
libraryDependency("Gradle: android.arch.core:runtime:1.1.0@aar", 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) libraryDependency("Gradle: android.arch.lifecycle:common:1.1.0@jar", DependencyScope.COMPILE)
@@ -428,7 +427,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
@Test @Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+") @PluginTargetVersions(gradleVersion = "5.0+", pluginVersion = "1.3.50+")
fun testSingleAndroidTarget() { fun testSingleAndroidTarget() {
configureByFiles() configureByFiles()
importProject() importProject()
@@ -613,7 +612,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
} }
@Test @Test
@PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+") @PluginTargetVersions(gradleVersion = "5.0+", pluginVersion = "1.3.20+")
fun testDetectAndroidSources() { fun testDetectAndroidSources() {
configureByFiles() configureByFiles()
createProjectSubFile( createProjectSubFile(
@@ -5,11 +5,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 26 compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
applicationId "jetbrains.org.myapplication" applicationId "jetbrains.org.myapplication"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 26 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -4,7 +4,7 @@ buildscript {
{{kotlin_plugin_repositories}} {{kotlin_plugin_repositories}}
} }
dependencies { 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") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
{{extraPluginDependencies}} {{extraPluginDependencies}}
} }
@@ -8,7 +8,7 @@ buildscript {
} }
dependencies { 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" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
{{extraPluginDependencies}} {{extraPluginDependencies}}
} }
@@ -5,10 +5,11 @@ plugins {
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 26 compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 26 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@@ -18,6 +18,7 @@ apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 28 compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
applicationId 'org.jetbrains.kotlin.mpp_app_android' applicationId 'org.jetbrains.kotlin.mpp_app_android'
minSdkVersion 15 minSdkVersion 15
@@ -3,7 +3,7 @@ buildscript {
{{kotlin_plugin_repositories}} {{kotlin_plugin_repositories}}
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.5.2'
} }
} }
repositories { repositories {