Skip to content

Commit cef0a24

Browse files
committed
1 parent 01822fc commit cef0a24

File tree

4 files changed

+2
-18
lines changed

4 files changed

+2
-18
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
jdkRelease = "17"
33
minGradle = "9.0.0"
4-
kotlin = "2.3.0"
4+
kotlin = "2.3.20-Beta1"
55
moshi = "1.15.2"
66
pluginPublish = "2.0.0"
77

src/documentTest/kotlin/com/github/jengelman/gradle/plugins/shadow/snippet/SnippetExecutable.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.github.jengelman.gradle.plugins.shadow.snippet
22

33
import com.github.jengelman.gradle.plugins.shadow.testkit.assertNoDeprecationWarnings
44
import com.github.jengelman.gradle.plugins.shadow.testkit.gradleRunner
5-
import com.github.jengelman.gradle.plugins.shadow.testkit.toWarningsAsErrors
65
import java.nio.file.Path
76
import java.util.jar.JarOutputStream
87
import kotlin.io.path.createDirectory
@@ -92,11 +91,7 @@ sealed class SnippetExecutable : Executable {
9291
}
9392

9493
try {
95-
gradleRunner(
96-
projectDir = projectRoot,
97-
arguments = listOf("build", "--stacktrace"),
98-
warningsAsErrors = mainScript.toWarningsAsErrors(),
99-
)
94+
gradleRunner(projectDir = projectRoot, arguments = listOf("build", "--stacktrace"))
10095
.build()
10196
.assertNoDeprecationWarnings()
10297
} catch (t: Throwable) {

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/BasePluginTest.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import com.github.jengelman.gradle.plugins.shadow.testkit.assertNoDeprecationWar
1313
import com.github.jengelman.gradle.plugins.shadow.testkit.commonGradleArgs
1414
import com.github.jengelman.gradle.plugins.shadow.testkit.gradleRunner
1515
import com.github.jengelman.gradle.plugins.shadow.testkit.requireResourceAsPath
16-
import com.github.jengelman.gradle.plugins.shadow.testkit.toWarningsAsErrors
1716
import com.github.jengelman.gradle.plugins.shadow.transformers.ResourceTransformer
1817
import com.github.jengelman.gradle.plugins.shadow.util.AppendableMavenRepository
1918
import com.github.jengelman.gradle.plugins.shadow.util.JarBuilder
@@ -378,16 +377,9 @@ abstract class BasePluginTest {
378377
}
379378

380379
private fun runner(arguments: Iterable<String>, block: GradleRunner.() -> Unit): GradleRunner {
381-
val warningsAsErrors =
382-
try {
383-
projectScript.readText().toWarningsAsErrors()
384-
} catch (_: UninitializedPropertyAccessException) {
385-
true // Default warning mode if projectScript is not initialized yet.
386-
}
387380
return gradleRunner(
388381
projectDir = projectRoot,
389382
arguments = commonGradleArgs + arguments,
390-
warningsAsErrors = warningsAsErrors,
391383
block = block,
392384
)
393385
}

src/testKit/kotlin/com/github/jengelman/gradle/plugins/shadow/testkit/GradleRunner.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,3 @@ fun BuildResult.assertNoDeprecationWarnings() = apply {
6060
"will fail with an error in Gradle",
6161
)
6262
}
63-
64-
// TODO: https://youtrack.jetbrains.com/issue/KT-78620
65-
fun String.toWarningsAsErrors(): Boolean = !contains("org.jetbrains.kotlin.multiplatform")

0 commit comments

Comments
 (0)