Skip to content

Commit 785bfd4

Browse files
committed
mainSourceSet should use extensions.getByType
1 parent 12a7c06 commit 785bfd4

File tree

1 file changed

+2
-4
lines changed
  • src/main/kotlin/org/jetbrains/intellij

1 file changed

+2
-4
lines changed

src/main/kotlin/org/jetbrains/intellij/utils.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import org.gradle.api.logging.Logging
2929
import org.gradle.api.plugins.JavaPluginConvention
3030
import org.gradle.api.tasks.SourceSet
3131
import org.gradle.internal.os.OperatingSystem
32-
import org.gradle.kotlin.dsl.getPlugin
32+
import org.gradle.kotlin.dsl.getByType
3333
import org.gradle.process.JavaForkOptions
3434
import org.jdom2.Document
3535
import org.jdom2.JDOMException
@@ -60,10 +60,8 @@ import java.util.function.Predicate
6060

6161
val MAJOR_VERSION_PATTERN = "(RIDER-|GO-)?\\d{4}\\.\\d-(EAP\\d*-)?SNAPSHOT".toPattern()
6262

63-
@Suppress("DEPRECATION")
6463
fun mainSourceSet(project: Project): SourceSet = project
65-
.convention.getPlugin<JavaPluginConvention>()
66-
// .extensions.getByType<JavaPluginConvention>() // available since Gradle 7.1
64+
.extensions.getByType<JavaPluginConvention>()
6765
.sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
6866

6967
fun sourcePluginXmlFiles(project: Project) = mainSourceSet(project).resources.srcDirs.mapNotNull {

0 commit comments

Comments
 (0)