[repo] Migrate 'configureFrontendIr()' into buildSrc

This commit is contained in:
Yahor Berdnikau
2023-06-30 19:14:44 +02:00
committed by Space Team
parent 73a757c105
commit db1086f005
12 changed files with 28 additions and 29 deletions
+18 -1
View File
@@ -9,9 +9,10 @@ import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.file.FileCollection
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.*
import org.gradle.process.CommandLineArgumentProvider
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
@JvmOverloads
fun Project.configureJava9Compilation(
@@ -62,3 +63,19 @@ private class Java9AdditionalArgumentsProvider(
"-Xlint:-requires-transitive-automatic" // suppress automatic module transitive dependencies in kotlin.test
)
}
fun Project.configureFrontendIr() = tasks.withType<KotlinJvmCompile>().configureEach {
compilerOptions {
if (project.kotlinBuildProperties.useFirForLibraries) {
freeCompilerArgs.add("-Xuse-k2")
allWarningsAsErrors.set(false)
} else if (project.kotlinBuildProperties.useFir) {
freeCompilerArgs.add("-Xskip-prerelease-check")
}
val renderDiagnosticNames by extra(project.kotlinBuildProperties.renderDiagnosticNames)
if (renderDiagnosticNames) {
freeCompilerArgs.add("-Xrender-internal-diagnostic-names")
}
}
}
-18
View File
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
ext.manifestAttributes = { Manifest manifest, Project project, String component = null, boolean multiRelease = false ->
project.configure(manifest) {
attributes \
@@ -48,19 +46,3 @@ task preparePublication {
println("Deployment repository url: ${ext.repoUrl}")
}
}
ext.configureFrontendIr = { Project project ->
project.tasks.withType(KotlinCompile.class) { task ->
task.kotlinOptions {
if (project.kotlinBuildProperties.useFirForLibraries) {
freeCompilerArgs += "-Xuse-k2"
allWarningsAsErrors = false
} else if (project.kotlinBuildProperties.useFir) {
freeCompilerArgs += "-Xskip-prerelease-check"
}
if (project.properties.renderDiagnosticNames) {
freeCompilerArgs += "-Xrender-internal-diagnostic-names"
}
}
}
}
+1 -1
View File
@@ -42,7 +42,7 @@ compileTestKotlin {
]
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
if (includeJava9) {
LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.junit')
+1 -1
View File
@@ -43,7 +43,7 @@ compileTestKotlin {
]
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
if (includeJava9) {
LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.junit5')
+1 -1
View File
@@ -47,7 +47,7 @@ compileTestKotlin {
]
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
if (includeJava9) {
LibrariesCommon.configureJava9Compilation(project, 'kotlin.test')
+1 -1
View File
@@ -44,7 +44,7 @@ compileTestKotlin {
]
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
if (includeJava9) {
LibrariesCommon.configureJava9Compilation(project, 'kotlin.test.testng')
+1 -1
View File
@@ -59,7 +59,7 @@ compileKotlin {
}
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
jar {
manifestAttributes(manifest, project, "internal")
+1 -1
View File
@@ -53,7 +53,7 @@ compileKotlin {
compileTestKotlin {
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
LibrariesCommon.configureJava9Compilation(project, 'kotlin.stdlib.jdk7')
+1 -1
View File
@@ -62,7 +62,7 @@ compileKotlin {
compileTestKotlin {
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
LibrariesCommon.configureJava9Compilation(project, 'kotlin.stdlib.jdk8')
+1 -1
View File
@@ -221,7 +221,7 @@ compileLongRunningTestKotlin {
kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.ExperimentalStdlibApi"
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
tasks.register("longRunningTest", Test) {
dependsOn(longRunningTestClasses)
@@ -28,4 +28,4 @@ compileKotlin {
kotlinOptions.moduleName = project.name
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)
+1 -1
View File
@@ -32,4 +32,4 @@ compileKotlin {
kotlinOptions.moduleName = project.name
}
configureFrontendIr(project)
LibrariesCommon.configureFrontendIr(project)