azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix deprecation warnings in Kapt3AndroidExternalIT

Browse Source
This commit is contained in:
Alexander.Likhachev
2023-01-17 00:57:33 +01:00
parent 21624d6d07
commit 7949197b62
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt
+8 -3
View File
@@ -101,11 +101,16 @@ class Kapt3AndroidExternalIT : Kapt3BaseIT() {
agpVersion: String, agpVersion: String,
jdkVersion: JdkVersions.ProvidedJdk, jdkVersion: JdkVersions.ProvidedJdk,
) { ) {
val realmVersion = if (gradleVersion >= GradleVersion.version(TestVersions.Gradle.G_7_5)) {
"10.13.0-transformer-api"
} else {
"10.13.0"
}
project( project(
"android-realm".withPrefix, "android-realm".withPrefix,
gradleVersion, gradleVersion,
buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion), buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion, freeArgs = listOf("-Prealm_version=$realmVersion")),
buildJdk = jdkVersion.location buildJdk = jdkVersion.location,
) { ) {
build("assembleDebug") { build("assembleDebug") {
assertKaptSuccessful() assertKaptSuccessful()
@@ -165,7 +170,7 @@ class Kapt3AndroidExternalIT : Kapt3BaseIT() {
buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion), buildOptions = defaultBuildOptions.copy(androidVersion = agpVersion),
buildJdk = jdkVersion.location 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") { build("assembleDebug", "-Psafe_args_version=$safeArgsVersion") {
assertFileInProjectExists("build/generated/source/navigation-args/debug/test/androidx/navigation/StartFragmentDirections.java") assertFileInProjectExists("build/generated/source/navigation-args/debug/test/androidx/navigation/StartFragmentDirections.java")
assertFileInProjectExists("build/tmp/kotlin-classes/debug/test/androidx/navigation/StartFragmentKt.class") assertFileInProjectExists("build/tmp/kotlin-classes/debug/test/androidx/navigation/StartFragmentKt.class")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-realm/build.gradle
+1 -5
View File
@@ -4,7 +4,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { 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 { compileOptions {
sourceCompatibility 1.8 sourceCompatibility 1.8
targetCompatibility 1.8 targetCompatibility 1.8