@@ -11,7 +11,6 @@ import org.gradle.api.Plugin
1111import org.gradle.api.Project
1212import org.gradle.api.file.FileCollection
1313import org.gradle.api.plugins.JavaBasePlugin
14- import org.gradle.api.plugins.JavaPluginConvention
1514import org.gradle.api.plugins.JavaPluginExtension
1615import org.gradle.api.provider.ProviderFactory
1716import org.gradle.api.tasks.compile.JavaCompile
@@ -44,15 +43,17 @@ class JavaCrossCompilePlugin @Inject constructor(private val providerFactory: Pr
4443 if (! extension.enabled) {
4544 return
4645 }
47- val convention = project.convention.plugins[" java" ] as JavaPluginConvention ? ? : return
48-
4946 // Do not configure project if toolchains are used
50- val toolchain = project.extensions.getByType(JavaPluginExtension ::class .java).toolchain
47+ val javaPluginExtension = project.extensions.findByType(JavaPluginExtension ::class .java)
48+ if (javaPluginExtension == null ) {
49+ return
50+ }
51+ val toolchain = javaPluginExtension.toolchain
5152 if ((toolchain as DefaultToolchainSpec ).isConfigured) {
5253 project.logger.debug(" Toolchain is configured for this project, skipping java-cross-compile plugin configuration" )
5354 return
5455 }
55- val targetCompatibility = convention .targetCompatibility
56+ val targetCompatibility = javaPluginExtension .targetCompatibility
5657 if (targetCompatibility < JavaVersion .current()) {
5758 with (project.tasks) {
5859 val location by lazy { targetCompatibility.locate(project, providers) }
0 commit comments