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

[Gradle] Update AGP for KGP functional tests to support Gradle 8

Browse Source 
#KTI-1221 In Progress
This commit is contained in:
Alexander.Likhachev
2023-05-18 02:12:12 +02:00
committed by Space Team
parent 862f8f235c
commit 7690904bc4
2 changed files with 361 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+13 -2
View File
@@ -1,5 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.github.jengelman.gradle.plugins.shadow.transformers.DontIncludeResourceTransformer
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.pill.PillExtension
plugins {
@@ -274,6 +276,15 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
}
val functionalTestCompilation = kotlin.target.compilations.getByName("functionalTest")
functionalTestCompilation.compileJavaTaskProvider.configure {
sourceCompatibility = JavaLanguageVersion.of(11).toString()
targetCompatibility = JavaLanguageVersion.of(11).toString()
}
functionalTestCompilation.compileTaskProvider.configure {
with(this as KotlinCompile) {
kotlinJavaToolchain.toolchain.use(project.getToolchainLauncherFor(JdkMajorVersion.JDK_11_0))
}
}
functionalTestCompilation.associateWith(kotlin.target.compilations.getByName("main"))
functionalTestCompilation.associateWith(kotlin.target.compilations.getByName("common"))
@@ -316,8 +327,8 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
val implementation = project.configurations.getByName(functionalTestSourceSet.implementationConfigurationName)
val compileOnly = project.configurations.getByName(functionalTestSourceSet.compileOnlyConfigurationName)
implementation("com.android.tools.build:gradle:7.2.1")
implementation("com.android.tools.build:gradle-api:7.2.1")
implementation("com.android.tools.build:gradle:7.4.2")
implementation("com.android.tools.build:gradle-api:7.4.2")
compileOnly("com.android.tools:common:30.2.1")
implementation(gradleKotlinDsl())
implementation(project(":kotlin-gradle-plugin-kpm-android"))