From 18e4d9e16c8fb780fe308c559d3b85c05dcf790a Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 14 Sep 2022 16:09:40 +0200 Subject: [PATCH] Deprecate modules of the empty artifacts to discourage their usage #KT-51907 --- libraries/stdlib/jdk7/build.gradle | 4 ++++ libraries/stdlib/jdk7/java9/module-info.java | 4 ++++ libraries/stdlib/jdk8/build.gradle | 3 +++ libraries/stdlib/jdk8/java9/module-info.java | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index ad70bc4264e..7af04e45c98 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -49,6 +49,10 @@ jar { from sourceSets.java9.output } +sourcesJar { + from sourceSets.java9.allSource +} + artifacts { archives sourcesJar diff --git a/libraries/stdlib/jdk7/java9/module-info.java b/libraries/stdlib/jdk7/java9/module-info.java index de625ccb07c..0d2a662126e 100644 --- a/libraries/stdlib/jdk7/java9/module-info.java +++ b/libraries/stdlib/jdk7/java9/module-info.java @@ -1,4 +1,8 @@ +/** + * @deprecated This module is empty and therefore deprecated, please use kotlin.stdlib instead. + */ @SuppressWarnings("module") // suppress warnings about terminal digit and exporting packages to not-yet-built kotlin-stdlib-jdk8 +@Deprecated module kotlin.stdlib.jdk7 { requires transitive kotlin.stdlib; } diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle index 43b3e2c5b6b..91836860531 100644 --- a/libraries/stdlib/jdk8/build.gradle +++ b/libraries/stdlib/jdk8/build.gradle @@ -53,6 +53,9 @@ jar { from sourceSets.java9.output } +sourcesJar { + from sourceSets.java9.allSource +} artifacts { archives sourcesJar diff --git a/libraries/stdlib/jdk8/java9/module-info.java b/libraries/stdlib/jdk8/java9/module-info.java index d3e4a704cb8..91a86d2c860 100644 --- a/libraries/stdlib/jdk8/java9/module-info.java +++ b/libraries/stdlib/jdk8/java9/module-info.java @@ -1,4 +1,8 @@ +/** + * @deprecated This module is empty and therefore deprecated, please use kotlin.stdlib instead. + */ @SuppressWarnings("module") // suppress warning about terminal digit +@Deprecated module kotlin.stdlib.jdk8 { requires transitive kotlin.stdlib; requires kotlin.stdlib.jdk7;