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
Consider common supertype of `S` and `Nothing`, where `S` has nullable
upper bound or it's flexible. Before the fix, result was `S?`, which
is correct but too conservative. Now, we'll preserve nullability of
resulting type if it's already nullable.
This happened because we were failing to find path of not-nullable
types from `Nothing` to `S`, which should obviously exists by
semantics of Nothing
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