diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt index 0ab81d392bf..6b67142ee9f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt @@ -101,11 +101,16 @@ class Kapt3AndroidExternalIT : Kapt3BaseIT() { agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk, ) { + val realmVersion = if (gradleVersion >= GradleVersion.version(TestVersions.Gradle.G_7_5)) { + "10.13.0-transformer-api" + } else { + "10.13.0" + } project( "android-realm".withPrefix, gradleVersion, - buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion), - buildJdk = jdkVersion.location + buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion, freeArgs = listOf("-Prealm_version=$realmVersion")), + buildJdk = jdkVersion.location, ) { build("assembleDebug") { assertKaptSuccessful() @@ -165,7 +170,7 @@ class Kapt3AndroidExternalIT : Kapt3BaseIT() { buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion), buildJdk = jdkVersion.location ) { - val safeArgsVersion = if (gradleVersion >= GradleVersion.version(TestVersions.Gradle.G_7_0)) "2.5.3" else "2.1.0" + val safeArgsVersion = if (gradleVersion >= GradleVersion.version(TestVersions.Gradle.G_7_0)) "2.5.3" else "2.3.5" build("assembleDebug", "-Psafe_args_version=$safeArgsVersion") { assertFileInProjectExists("build/generated/source/navigation-args/debug/test/androidx/navigation/StartFragmentDirections.java") assertFileInProjectExists("build/tmp/kotlin-classes/debug/test/androidx/navigation/StartFragmentKt.class") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle index 6f504c564ea..182fb099751 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath "io.realm:realm-gradle-plugin:10.12.0" + classpath "io.realm:realm-gradle-plugin:$realm_version" } } @@ -32,10 +32,6 @@ android { } } - dexOptions { - incremental false - } - compileOptions { sourceCompatibility 1.8 targetCompatibility 1.8