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

[Gradle] Don't suppress warnings for tests that don't produce them

Browse Source 
dont produce
This commit is contained in:
Alexander.Likhachev
2023-01-16 22:10:32 +01:00
parent 7949197b62
commit 9386fbbe0f
12 changed files with 15 additions and 53 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/BuildCacheRelocationIT.kt
+2 -12
View File
@@ -74,11 +74,7 @@ class BuildCacheRelocationIT : KGPBaseTest() {
@DisplayName("works with JS/DCE project")
@GradleTest
fun testRelocationKotlinJs(gradleVersion: GradleVersion) {
val (firstProject, secondProject) = prepareTestProjects(
"kotlin-js-dce",
gradleVersion,
buildOptions = defaultBuildOptions.copy(warningMode = WarningMode.Summary) // Jar tasks produces deprecation warnings
)
val (firstProject, secondProject) = prepareTestProjects("kotlin-js-dce", gradleVersion)
checkBuildCacheRelocation(
firstProject,
@@ -97,13 +93,7 @@ class BuildCacheRelocationIT : KGPBaseTest() {
@DisplayName("works with Multiplatform")
@GradleTest
fun testRelocationMultiplatform(gradleVersion: GradleVersion) {
val (firstProject, secondProject) = prepareTestProjects(
"new-mpp-lib-with-tests",
gradleVersion,
buildOptions = defaultBuildOptions.copy(
warningMode = WarningMode.Summary // Remove it once project will be updated
)
)
val (firstProject, secondProject) = prepareTestProjects("new-mpp-lib-with-tests", gradleVersion)
checkBuildCacheRelocation(
firstProject,
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt
-2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.configuration.WarningMode
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
import org.jetbrains.kotlin.gradle.testbase.*
@@ -21,7 +20,6 @@ abstract class AbstractJsConfigurationCacheIT(protected val irBackend: Boolean)
final override val defaultBuildOptions =
super.defaultBuildOptions.copy(
jsOptions = defaultJsOptions,
warningMode = WarningMode.Summary,
configurationCache = true,
configurationCacheProblems = BaseGradleIT.ConfigurationCacheProblems.FAIL
)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
-2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.gradle
import org.gradle.api.JavaVersion
import org.gradle.api.logging.LogLevel
import org.gradle.api.logging.configuration.WarningMode
import org.gradle.testkit.runner.BuildResult
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.tasks.USING_JVM_INCREMENTAL_COMPILATION_MESSAGE
@@ -46,7 +45,6 @@ abstract class Kapt3BaseIT : KGPBaseTest() {
override val defaultBuildOptions: BuildOptions = super.defaultBuildOptions
.copy(
kaptOptions = this.kaptOptions(),
warningMode = WarningMode.Summary
)
protected open fun kaptOptions(): BuildOptions.KaptOptions = BuildOptions.KaptOptions(
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
-1
View File
@@ -553,7 +553,6 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean)
final override val defaultBuildOptions =
super.defaultBuildOptions.copy(
jsOptions = defaultJsOptions,
warningMode = WarningMode.Summary
)
protected fun BuildResult.checkIrCompilationMessage() {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
-3
View File
@@ -58,7 +58,6 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() {
project(
"kotlin-js-plugin-project",
gradleVersion,
buildOptions = defaultBuildOptions.copy(warningMode = WarningMode.Summary)
) {
buildGradleKts.modify { it.lines().filter { "html" !in it }.joinToString("\n") }
kotlinSourcesDir().resolve("Main.kt").modify { "fun f() = listOf(1, 2, 3).joinToString()" }
@@ -79,7 +78,6 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() {
project(
"kotlin-js-plugin-project",
gradleVersion,
buildOptions = defaultBuildOptions.copy(warningMode = WarningMode.Summary)
) {
buildGradleKts.modify { it.lines().filter { "html" !in it }.joinToString("\n") }
kotlinSourcesDir().resolve("Main.kt").modify { "fun f() = listOf(1, 2, 3).joinToString()" }
@@ -352,7 +350,6 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() {
project(
"kotlin-js-plugin-project",
gradleVersion,
buildOptions = defaultBuildOptions.copy(warningMode = WarningMode.Summary)
) {
assertKotlinTestDependency(
listOf("testImplementation"),
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
+3 -3
View File
@@ -1468,7 +1468,7 @@ class NewMultiplatformIT : BaseGradleIT() {
@Suppress("DEPRECATION")
build(
"runRhino",
options = defaultBuildOptions().copy(warningMode = WarningMode.Summary, jsCompilerType = KotlinJsCompilerType.LEGACY)
options = defaultBuildOptions().copy(jsCompilerType = KotlinJsCompilerType.LEGACY)
) {
assertSuccessful()
assertTasksExecuted(":mainProject:processDceBrowserKotlinJs")
@@ -1636,7 +1636,7 @@ class NewMultiplatformIT : BaseGradleIT() {
val groupDir = "build/repo/com/example/"
build(":mpp-lib:publish", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) {
build(":mpp-lib:publish") {
assertSuccessful()
assertFileExists(groupDir + "mpp-lib")
assertFileExists(groupDir + "mpp-lib-myjvm")
@@ -1651,7 +1651,7 @@ class NewMultiplatformIT : BaseGradleIT() {
add("-Pkotlin.mpp.keepMppDependenciesIntactInPoms=true")
}.toTypedArray()
build(*params, options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) {
build(*params) {
assertSuccessful()
assertTasksExecuted(":jvm-app:publishMainPublicationToMavenRepository")
assertTasksExecuted(":js-app:publishMavenPublicationToMavenRepository")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt
+6 -19
View File
@@ -36,23 +36,16 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() {
with(outerProject) {
embedProject(innerProject)
gradleBuildScript(innerProject.projectName).appendText("\nrepositories { jcenter() }; dependencies { implementation rootProject }")
gradleBuildScript(innerProject.projectName).appendText("\ndependencies { implementation rootProject }")
testResolveAllConfigurations(
subproject = innerProject.projectName,
options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)
) {
testResolveAllConfigurations(subproject = innerProject.projectName) {
assertContains(">> :${innerProject.projectName}:runtimeClasspath --> sample-lib-nodejs-1.0.klib")
}
@Suppress("DEPRECATION")
gradleProperties().appendText(jsCompilerType(KotlinJsCompilerType.LEGACY))
testResolveAllConfigurations(
subproject = innerProject.projectName,
skipSetup = true,
options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)
) {
testResolveAllConfigurations(subproject = innerProject.projectName, skipSetup = true) {
assertContains(">> :${innerProject.projectName}:runtimeClasspath --> sample-lib-nodejs-1.0.jar")
}
}
@@ -80,7 +73,7 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() {
embedProject(innerProject)
gradleBuildScript().appendText("\ndependencies { nodeJsMainImplementation project(':${innerProject.projectName}') }")
testResolveAllConfigurations(innerProject.projectName, options = defaultBuildOptions().copy(warningMode = WarningMode.Summary))
testResolveAllConfigurations(innerProject.projectName)
}
}
@@ -162,10 +155,7 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() {
""".trimIndent()
)
testResolveAllConfigurations(
innerJvmProject.projectName,
options = defaultBuildOptions().copy(warningMode = WarningMode.Summary),
)
testResolveAllConfigurations(innerJvmProject.projectName)
}
}
@@ -206,10 +196,7 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() {
""".trimIndent()
)
testResolveAllConfigurations(
project.projectName,
options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)
)
testResolveAllConfigurations(project.projectName)
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KT50161AndroidBuildCacheTest.kt
-2
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle.android
import org.gradle.api.logging.configuration.WarningMode
import org.gradle.testkit.runner.BuildResult
import org.gradle.testkit.runner.BuildTask
import org.gradle.util.GradleVersion
@@ -33,7 +32,6 @@ class KT50161AndroidBuildCacheTest : KGPBaseTest() {
defaultBuildOptions.copy(
androidVersion = agpVersion,
buildCacheEnabled = true,
warningMode = WarningMode.Summary
),
buildJdk = jdkVersion.location,
) {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt
-1
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle.native
import org.gradle.api.logging.configuration.WarningMode
import org.jetbrains.kotlin.gradle.BaseGradleIT
import org.jetbrains.kotlin.gradle.GradleVersionRequired
import org.jetbrains.kotlin.gradle.suppressDeprecationWarningsOnAgpLessThan
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/lib/build.gradle.kts
+2 -6
View File
@@ -2,8 +2,6 @@ plugins {
kotlin("js")
}
var conf: Configuration? = null
kotlin {
js {
val otherCompilation = compilations.create("other")
@@ -16,7 +14,8 @@ kotlin {
isCanBeConsumed = true
isCanBeResolved = false
}
conf = otherDist
val runtimeOnly by configurations.getting
runtimeOnly.extendsFrom(otherDist)
artifacts {
add(otherDist.name, tasks.named("otherKlib").map { it.outputs.files.files.first() })
}
@@ -28,9 +27,6 @@ kotlin {
sourceSets {
val main by getting {
kotlin.exclude("**/other/**")
dependencies {
runtimeOnly(conf!!)
}
}
val other by getting {
kotlin.srcDirs("src/main/kotlin/other")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts
+1 -1
View File
@@ -43,7 +43,7 @@ kotlin.target.compilations.create("benchmark") {
defaultSourceSet.dependencies {
val main by kotlin.target.compilations
implementation(main.compileDependencyFiles + main.output.classesDirs)
runtimeOnly(main.runtimeDependencyFiles)
runtimeOnly(files(main.runtimeDependencyFiles))
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle
+1 -1
View File
@@ -36,7 +36,7 @@ dependencies {
task runRhino(type: JavaExec) {
classpath = sourceSets.main.runtimeClasspath
workingDir = "${buildDir}/kotlin2js/main/"
main = 'org.mozilla.javascript.tools.shell.Main'
mainClass = 'org.mozilla.javascript.tools.shell.Main'
args = ["-opt", "-1", "-f", "amd.js", "-f", "kotlin.js", "-f", "app.js", "-f", "check.js"]
}