From d6cb469e6645d0cfb9afae75b9e5428e963dafb6 Mon Sep 17 00:00:00 2001 From: "nataliya.valtman" Date: Mon, 1 Jun 2020 15:23:58 +0300 Subject: [PATCH] use Gradle 5.6 for tests with android build tool 28.0.3 --- .../gradle/AbstractKotlinAndroidGradleTests.kt | 4 ++++ .../org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt | 12 ++++++++++++ .../libAndroidClassesOnly/build.gradle | 2 +- .../testProject/AndroidProject/Android/build.gradle | 2 +- .../testProject/AndroidProject/Lib/build.gradle | 2 +- .../plugin/statistics/KotlinBuildStatsService.kt | 10 ++++++---- 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index 13897ae7ace..65bdf322587 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -343,6 +343,10 @@ open class KotlinAndroid32GradleIT : KotlinAndroid3GradleIT() { override val androidGradlePluginVersion: AGPVersion get() = AGPVersion.v3_2_0 + //android build tool 28.0.3 use org.gradle.api.file.ProjectLayout#fileProperty(org.gradle.api.provider.Provider) that was deleted in gradle 6.0 + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.Until("5.6.4") + @Test fun testKaptUsingApOptionProvidersAsNestedInputOutput() = with(Project("AndroidProject")) { setupWorkingDir() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt index ba964e58141..b02ff0a0061 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt @@ -9,17 +9,29 @@ import java.io.File class Kapt3WorkersAndroid32IT : Kapt3Android32IT() { override fun kaptOptions(): KaptOptions = super.kaptOptions().copy(useWorkers = true) + + //android build tool 28.0.3 use org.gradle.api.file.ProjectLayout#fileProperty(org.gradle.api.provider.Provider) that was deleted in gradle 6.0 + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.Until("5.6.4") } open class Kapt3Android32IT : Kapt3AndroidIT() { override val androidGradlePluginVersion: AGPVersion get() = AGPVersion.v3_2_0 + + //android build tool 28.0.3 use org.gradle.api.file.ProjectLayout#fileProperty(org.gradle.api.provider.Provider) that was deleted in gradle 6.0 + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.Until("5.6.4") } open class Kapt3Android33IT : Kapt3AndroidIT() { override val androidGradlePluginVersion: AGPVersion get() = AGPVersion.v3_3_2 + //android build tool 28.0.3 use org.gradle.api.file.ProjectLayout#fileProperty(org.gradle.api.provider.Provider) that was deleted in gradle 6.0 + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.Until("5.6.4") + @Test fun testAndroidxNavigationSafeArgs() = with(Project("androidx-navigation-safe-args", directoryPrefix = "kapt2")) { // KT-30735 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libAndroidClassesOnly/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libAndroidClassesOnly/build.gradle index 87353a02404..e2279e8f90d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libAndroidClassesOnly/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidIncrementalMultiModule/libAndroidClassesOnly/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 23 - buildToolsVersion "25.0.2" + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 14 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle index 1a9ff296900..569cc883c54 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 22 - buildToolsVersion "25.0.2" + buildToolsVersion "28.0.3" sourceSets { main.java.srcDirs += 'src/main/java2' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle index 4e4a4531e0a..0d2984e811a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle @@ -11,7 +11,7 @@ dependencies { android { compileSdkVersion 22 - buildToolsVersion "25.0.2" + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 7 diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildStatsService.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildStatsService.kt index e658c72c55e..27d54c8cb4c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildStatsService.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildStatsService.kt @@ -252,10 +252,12 @@ internal class DefaultKotlinBuildStatsService internal constructor( gradle.rootProject.properties["kotlin.code.style"] == "official" ) // constants are saved in IDEA plugin and could not be accessed directly - val executedTaskNames = gradle.taskGraph.allTasks.map { it.name }.distinct() - report(BooleanMetrics.COMPILATION_STARTED, executedTaskNames.contains("compileKotlin")) - report(BooleanMetrics.TESTS_EXECUTED, executedTaskNames.contains("compileTestKotlin")) - report(BooleanMetrics.MAVEN_PUBLISH_EXECUTED, executedTaskNames.contains("install")) + gradle.taskGraph.whenReady() { taskExecutionGraph -> + val executedTaskNames = taskExecutionGraph.allTasks.map { it.name }.distinct() + report(BooleanMetrics.COMPILATION_STARTED, executedTaskNames.contains("compileKotlin")) + report(BooleanMetrics.TESTS_EXECUTED, executedTaskNames.contains("compileTestKotlin")) + report(BooleanMetrics.MAVEN_PUBLISH_EXECUTED, executedTaskNames.contains("install")) + } fun buildSrcExists(project: Project) = File(project.projectDir, "buildSrc").exists() if (buildSrcExists(gradle.rootProject)) {