Print a warning with an instruction on how to fix this. Don't warn about
different versions and duplicate plugins in composite build.
Issue #KT-30276 Fixed
The 'java' plugin doesn't expect the 'api' configuration to exist (it
is only introduced by the 'java-library' plugin) and doesn't map it
to the compile scope when publishing with the legacy 'maven' plugin.
This commit adds the missing conf2ScopeMapping for 'api' -> 'compile'
This is needed to ensure that POMs of single-platform Kotlin projects
depending on MPP libraries contain dependencies (Maven coordinates)
of the platform-specific modules of the libraries.
The mechanism and rationale are the same as in KT-28482
Issue #KT-27059 Fixed
This covers the cases when a user knows what they do and doesn't want
anything to do any changes to the POMs, e.g. they want to manually
replace all of the dependencies, so they need the original dependencies.
Remove resulting redeclarations and finish the split in files below:
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
This commit moves the temporary files back to their original paths.
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
This commit moves the original files to
temporary files suffixed with '.git_split_tmp'
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
This commit moves:
mpp\kotlinTargetPresets.kt -> mpp\KotlinMetadataTargetPreset.kt
mpp\kotlinCompilations.kt -> mpp\KotlinWithJavaCompilation.kt
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
This commit moves:
mpp\kotlinTargetPresets.kt -> mpp\KotlinJvmWithJavaTargetPreset.kt
mpp\kotlinCompilations.kt -> mpp\KotlinNativeCompilation.kt
mpp\KotlinCompilationFactory.kt -> mpp\KotlinWithJavaCompilationFactory.kt
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
This commit moves:
mpp\kotlinTargetPresets.kt -> mpp\KotlinJvmTargetPreset.kt
mpp\kotlinCompilations.kt -> mpp\KotlinJsCompilation.kt
mpp\KotlinCompilationFactory.kt -> mpp\KotlinNativeCompilationFactory.kt
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
This commit moves:
mpp\kotlinTargets.kt -> mpp\KotlinWithJavaTarget.kt
mpp\kotlinTargetPresets.kt -> mpp\KotlinJsTargetPreset.kt
mpp\kotlinCompilations.kt -> mpp\KotlinJvmAndroidCompilation.kt
mpp\KotlinCompilationFactory.kt -> mpp\KotlinJvmAndroidCompilationFactory.kt
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
This commit moves:
mpp\kotlinTargets.kt -> mpp\KotlinNativeTarget.kt
mpp\kotlinTargetPresets.kt -> mpp\KotlinNativeTargetPreset.kt
mpp\kotlinCompilations.kt -> mpp\KotlinJvmCompilation.kt
mpp\KotlinCompilationFactory.kt -> mpp\KotlinJvmCompilationFactory.kt
- from KotlinTargetConfigurator.kt
- to KotlinNativeTaretConfigurator.kt
- from mpp\kotlinTargets.kt
- to mpp\KotlinAndroidTarget.kt
- to mpp\KotlinNativeTarget.kt
- to mpp\KotlinWithJavaTarget.kt
- from mpp\kotlinTargetPresets.kt
- to mpp\KotlinAndroidTargetPreset.kt
- to mpp\KotlinNativeTargetPreset.kt
- to mpp\KotlinJsTargetPreset.kt
- to mpp\KotlinJvmTargetPreset.kt
- to mpp\KotlinJvmWithJavaTargetPreset.kt
- to mpp\KotlinMetadataTargetPreset.kt
- from mpp\kotlinCompilations.kt
- to mpp\KotlinCommonCompilation.kt
- to mpp\KotlinJvmCompilation.kt
- to mpp\KotlinJvmAndroidCompilation.kt
- to mpp\KotlinJsCompilation.kt
- to mpp\KotlinNativeCompilation.kt
- to mpp\KotlinWithJavaCompilation.kt
- from mpp\KotlinCompilationFactory.kt
- to mpp\KotlinJsCompilationFactory.kt
- to mpp\KotlinJvmCompilationFactory.kt
- to mpp\KotlinJvmAndroidCompilationFactory.kt
- to mpp\KotlinNativeCompilationFactory.kt
- to mpp\KotlinWithJavaCompilationFactory.kt
- from mpp\kotlinCompilationOutputs.kt
- to mpp\KotlinWithJavaCompilationOutput.kt
This commit moves:
KotlinTargetConfigurator.kt -> KotlinNativeTaretConfigurator.kt
mpp\kotlinTargets.kt -> mpp\KotlinAndroidTarget.kt
mpp\kotlinTargetPresets.kt -> mpp\KotlinAndroidTargetPreset.kt
mpp\kotlinCompilations.kt -> mpp\KotlinCommonCompilation.kt
mpp\KotlinCompilationFactory.kt -> mpp\KotlinJsCompilationFactory.kt
mpp\kotlinCompilationOutputs.kt -> mpp\KotlinWithJavaCompilationOutput.kt
Previously, we compared instances of different enums and thus the
conditions were always true. This did not affect visible behavior of the
program except the fact that we've been writing default field values
(kind and level) for version requirements to protobuf where they
could've been omitted
With gradle > 5.0 `publish()` helper call should be done before
`noDefaultJar()` or any other artifact hacks, otherwise singing plugin doesn't sign any jars
In publishing, use attribute containers of detached configuration
instead of HierarchyAttributeContainer, which is rejected by Gradle for
not being an AttributeContainerInternal.
Using attributes of a detached configuration is a small and
conservative fix; we may need to either not filter the attributes,
which will lead to [ProjectLocalConfigurations.ATTRIBUTE] being
published in the Gradle module metadata, which will potentially
complicate our attributes schema migration, or create proper,
non-detached configurations for publishing that are separated from the
configurations used for project-to-project dependencies.
Issue #KT-29758 Fixed