From aca2e46e62f605c07a72094b6b3adb4d7176e986 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Wed, 2 Mar 2022 11:05:26 +0100 Subject: [PATCH] Fix failing kapt test Dependency test is using was not available. Updated it to the latest stable version. --- .../org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt | 10 +++++++--- .../testProject/kapt2/android-dbflow/app/build.gradle | 2 +- .../testProject/kapt2/android-dbflow/build.gradle | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) 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 a5e63331c1a..5a8dffe7662 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 @@ -1,5 +1,6 @@ package org.jetbrains.kotlin.gradle +import org.gradle.api.logging.LogLevel import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.test.util.KtTestUtil @@ -241,15 +242,18 @@ abstract class Kapt3AndroidIT : BaseGradleIT() { @Test fun testDbFlow() { - val project = Project("android-dbflow", directoryPrefix = "kapt2") + val project = Project( + "android-dbflow", + directoryPrefix = "kapt2", + minLogLevel = LogLevel.INFO + ) project.build("assembleDebug") { assertSuccessful() assertKaptSuccessful() assertFileExists("app/build/generated/source/kapt/debug/com/raizlabs/android/dbflow/config/GeneratedDatabaseHolder.java") - assertFileExists("app/build/generated/source/kapt/debug/com/raizlabs/android/dbflow/config/AppDatabaseapp_Database.java") + assertFileExists("app/build/generated/source/kapt/debug/com/raizlabs/android/dbflow/config/AppDatabaseAppDatabase_Database.java") assertFileExists("app/build/generated/source/kapt/debug/mobi/porquenao/poc/kotlin/core/Item_Table.java") - assertFileExists("app/build/generated/source/kapt/debug/mobi/porquenao/poc/kotlin/core/Item_Adapter.java") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle index 27c3398e09e..7da40180c1a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/app/build.gradle @@ -23,7 +23,7 @@ android { } } -def dbflow_version = "3.1.1" +def dbflow_version = "4.2.4" dependencies { // Android Support Libraries diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/build.gradle index 5fe0ab3d857..26859fb7789 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-dbflow/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { mavenLocal() - maven { url 'https://maven.google.com' } + google() mavenCentral() } dependencies { @@ -13,8 +13,8 @@ buildscript { allprojects { repositories { mavenLocal() - maven { url 'https://maven.google.com' } + google() mavenCentral() - maven { url "https://jitpack.io" } + maven { url "https://www.jitpack.io" } } } \ No newline at end of file