diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 2b63713cc40..ed5e296e65e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -188,6 +188,18 @@ class NewMultiplatformIT : BaseGradleIT() { } } + @Test + fun testMavenPublishAppliedBeforeMultiplatformPlugin() = + with(Project("sample-lib", GradleVersionRequired.AtLeast("5.0"), "new-mpp-lib-and-app")) { + setupWorkingDir() + + gradleBuildScript().modify { "apply plugin: 'maven-publish'\n$it" } + + build { + assertSuccessful() + } + } + @Test fun testResourceProcessing() = with(Project("sample-lib", gradleVersion, "new-mpp-lib-and-app")) { val targetsWithResources = listOf("jvm6", "nodeJs", "wasm32", nativeHostTargetName) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt index cafb731558a..6d012474152 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt @@ -80,14 +80,15 @@ class KotlinMultiplatformPlugin( configureSourceSets(project) setUpConfigurationAttributes(project) - configurePublishingWithMavenPublish(project) - configureSourceJars(project) // set up metadata publishing targetsFromPreset.fromPreset( KotlinMetadataTargetPreset(project, instantiator, fileResolver, kotlinPluginVersion), METADATA_TARGET_NAME ) + configureSourceJars(project) + + configurePublishingWithMavenPublish(project) // propagate compiler plugin options to the source set language settings setupCompilerPluginOptions(project)