Skip to content

Commit f2ef86d

Browse files
committed
Remove usage of 'java' plugin
Since 1.7.1 release, animalsniffer plugin is able to work with 'java-base' plugin which is applied and configured by KMP/Jvm target.
1 parent 63f9be3 commit f2ef86d

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

buildSrc/src/main/kotlin/animalsniffer-conventions.gradle.kts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension
1111
*/
1212

1313
// Animalsniffer setup
14-
// Animalsniffer requires java plugin to be applied, but Kotlin 1.9.20
15-
// relies on `java-base` for Kotlin Multiplatforms `withJava` implementation
16-
// https://github.com/xvik/gradle-animalsniffer-plugin/issues/84
17-
// https://youtrack.jetbrains.com/issue/KT-59595
1814
plugins {
19-
java
2015
id("ru.vyarus.animalsniffer")
2116
}
2217

@@ -29,19 +24,6 @@ plugins.withId("org.jetbrains.kotlin.multiplatform") {
2924
configurations.findByName(outputConfigurationName)?.isCanBeConsumed = false
3025
}
3126

32-
disableJavaPluginTasks(extensions.getByName("sourceSets") as SourceSetContainer)
33-
}
34-
35-
fun Project.disableJavaPluginTasks(javaSourceSet: SourceSetContainer) {
36-
project.tasks.withType(Jar::class.java).named(javaSourceSet.getByName("main").jarTaskName).configure {
37-
dependsOn("jvmTest")
38-
enabled = false
39-
}
40-
41-
project.tasks.withType(Test::class.java).named(JavaPlugin.TEST_TASK_NAME) {
42-
dependsOn("jvmJar")
43-
enabled = false
44-
}
4527
}
4628

4729

0 commit comments

Comments
 (0)