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