[Git][java-team/gradle-kotlin-dsl][master] 5 commits: Compile against kotlin-compiler-embeddable instead of kotlin-compiler
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Wed Feb 1 10:03:00 GMT 2023
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / gradle-kotlin-dsl
Commits:
b003c65c by Emmanuel Bourg at 2023-01-31T15:05:20+01:00
Compile against kotlin-compiler-embeddable instead of kotlin-compiler
- - - - -
cb3eaa85 by Emmanuel Bourg at 2023-01-31T19:08:36+01:00
Add trove4j.jar to the classpath
- - - - -
33807f52 by Emmanuel Bourg at 2023-02-01T10:29:58+01:00
Add kotlin-script-runtime.jar to the classpath
- - - - -
8b31be71 by Emmanuel Bourg at 2023-02-01T10:34:49+01:00
Replaced the kotlin-stdlib-jre<n> dependencies with kotlin-stdlib-jdk<n>
- - - - -
3b12a11e by Emmanuel Bourg at 2023-02-01T11:02:38+01:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/libgradle-kotlin-dsl-java.links
- debian/patches/01-kotlin-compatibility.patch
- + debian/patches/03-kotlin-stdlib-jdk.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+gradle-kotlin-dsl (0.13.2-5) unstable; urgency=medium
+
+ * Compile against kotlin-compiler-embeddable instead of kotlin-compiler
+ * Add kotlin-script-runtime.jar and trove4j.jar to the classpath
+ * Replaced the kotlin-stdlib-jre<n> dependencies with kotlin-stdlib-jdk<n>
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 01 Feb 2023 11:02:33 +0100
+
gradle-kotlin-dsl (0.13.2-4) unstable; urgency=medium
* Path relative to the Gradle lib directory in the classpath.properties files
=====================================
debian/libgradle-kotlin-dsl-java.links
=====================================
@@ -8,3 +8,5 @@ usr/share/java/kotlin-sam-with-receiver-compiler-plugin.jar usr/share/gradl
usr/share/java/kotlin-stdlib.jar usr/share/gradle/lib/kotlin-stdlib.jar
usr/share/java/kotlin-stdlib-jdk7.jar usr/share/gradle/lib/kotlin-stdlib-jdk7.jar
usr/share/java/kotlin-stdlib-jdk8.jar usr/share/gradle/lib/kotlin-stdlib-jdk8.jar
+usr/share/java/libtrove-intellij.jar usr/share/gradle/lib/trove4j.jar
+usr/share/java/kotlin-script-runtime.jar usr/share/gradle/lib/kotlin-script-runtime.jar
=====================================
debian/patches/01-kotlin-compatibility.patch
=====================================
@@ -1,34 +1,9 @@
Description: Fixes the compatibility with the version of Kotlin in Debian
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
---- a/provider/src/main/kotlin/org/gradle/kotlin/dsl/provider/KotlinBuildScriptCompiler.kt
-+++ b/provider/src/main/kotlin/org/gradle/kotlin/dsl/provider/KotlinBuildScriptCompiler.kt
-@@ -34,7 +34,7 @@
- import org.gradle.plugin.use.PluginDependenciesSpec
- import org.gradle.plugin.use.internal.PluginRequestCollector
-
--import org.jetbrains.kotlin.com.intellij.openapi.util.text.StringUtilRt.convertLineSeparators
-+import com.intellij.openapi.util.text.StringUtilRt.convertLineSeparators
-
- import java.io.File
-
--- a/provider/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt
+++ b/provider/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt
-@@ -31,17 +31,17 @@
-
- import org.jetbrains.kotlin.codegen.CompilationException
-
--import org.jetbrains.kotlin.com.intellij.openapi.Disposable
--import org.jetbrains.kotlin.com.intellij.openapi.project.Project
--import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer.dispose
--import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer.newDisposable
-+import com.intellij.openapi.Disposable
-+import com.intellij.openapi.project.Project
-+import com.intellij.openapi.util.Disposer.dispose
-+import com.intellij.openapi.util.Disposer.newDisposable
-
- import org.jetbrains.kotlin.config.CommonConfigurationKeys
- import org.jetbrains.kotlin.config.CompilerConfiguration
+@@ -41,7 +41,7 @@
import org.jetbrains.kotlin.config.CompilerConfigurationKey
import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.config.JVMConfigurationKeys.*
=====================================
debian/patches/03-kotlin-stdlib-jdk.patch
=====================================
@@ -0,0 +1,68 @@
+Description: Replaces kotlin-stdlib-jre with kotlin-stdlib-jdk
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/provider/src/main/kotlin/org/gradle/kotlin/dsl/support/EmbeddedKotlinProvider.kt
++++ b/provider/src/main/kotlin/org/gradle/kotlin/dsl/support/EmbeddedKotlinProvider.kt
+@@ -58,8 +58,8 @@
+ // TODO:pm could be generated at build time
+ val annotations = EmbeddedModule("org.jetbrains", "annotations", "13.0")
+ val stdlib = embeddedKotlin("stdlib", listOf(annotations))
+- val stdlibJre7 = embeddedKotlin("stdlib-jre7", listOf(stdlib))
+- val stdlibJre8 = embeddedKotlin("stdlib-jre8", listOf(stdlibJre7))
++ val stdlibJre7 = embeddedKotlin("stdlib-jdk7", listOf(stdlib))
++ val stdlibJre8 = embeddedKotlin("stdlib-jdk8", listOf(stdlibJre7))
+ val reflect = embeddedKotlin("reflect", listOf(stdlib))
+ val compilerEmbeddable = embeddedKotlin("compiler-embeddable")
+ listOf(
+--- a/plugins/build.gradle.kts
++++ b/plugins/build.gradle.kts
+@@ -14,7 +14,7 @@
+ dependencies {
+ compileOnly(gradleKotlinDsl())
+
+- implementation(futureKotlin("stdlib-jre8"))
++ implementation(futureKotlin("stdlib-jdk8"))
+ implementation(futureKotlin("gradle-plugin"))
+ implementation(futureKotlin("sam-with-receiver"))
+
+--- a/plugins/src/main/kotlin/org/gradle/kotlin/dsl/plugins/embedded/EmbeddedKotlinPlugin.kt
++++ b/plugins/src/main/kotlin/org/gradle/kotlin/dsl/plugins/embedded/EmbeddedKotlinPlugin.kt
+@@ -47,14 +47,14 @@
+ embeddedKotlin.addDependenciesTo(
+ dependencies,
+ embeddedKotlinConfiguration.name,
+- "stdlib-jre8", "reflect")
++ "stdlib-jdk8", "reflect")
+
+ listOf("compileOnly", "testCompileOnly").forEach {
+ configurations.getByName(it).extendsFrom(embeddedKotlinConfiguration)
+ }
+
+ configurations.all {
+- embeddedKotlin.pinDependenciesOn(it, "stdlib-jre8", "reflect", "compiler-embeddable")
++ embeddedKotlin.pinDependenciesOn(it, "stdlib-jdk8", "reflect", "compiler-embeddable")
+ }
+ }
+ }
+--- a/tooling-builders/src/main/kotlin/org/gradle/kotlin/dsl/tooling/builders/KotlinLibSources.kt
++++ b/tooling-builders/src/main/kotlin/org/gradle/kotlin/dsl/tooling/builders/KotlinLibSources.kt
+@@ -100,7 +100,7 @@
+
+
+ private
+-val builtinKotlinModules = listOf("kotlin-stdlib-jre8", "kotlin-reflect")
++val builtinKotlinModules = listOf("kotlin-stdlib-jdk8", "kotlin-reflect")
+
+
+ private
+--- a/provider/src/main/kotlin/org/gradle/kotlin/dsl/provider/KotlinBuildScriptCompiler.kt
++++ b/provider/src/main/kotlin/org/gradle/kotlin/dsl/provider/KotlinBuildScriptCompiler.kt
+@@ -140,7 +140,7 @@
+ addRepositoryTo(scriptHandler.repositories)
+ pinDependenciesOn(
+ scriptHandler.configurations["classpath"],
+- "stdlib-jre8", "reflect")
++ "stdlib-jdk8", "reflect")
+ }
+ }
+
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
01-kotlin-compatibility.patch
02-generate-KotlinDependencyExtensions.patch
+03-kotlin-stdlib-jdk.patch
=====================================
debian/rules
=====================================
@@ -19,8 +19,9 @@ override_dh_auto_build:
# gradle-kotlin-dsl
kotlinc \
-cp 'tooling-models/target/gradle-kotlin-dsl-tooling-models.jar:\
- :/usr/share/java/kotlin-compiler.jar:\
+ :/usr/share/java/kotlin-compiler-embeddable.jar:\
:/usr/share/kotlin/kotlinc/lib/sam-with-receiver-compiler-plugin.jar:\
+ :/usr/share/java/atinject-jsr330-api.jar:\
:/usr/share/java/groovy.jar:\
:/usr/share/groovy/lib/groovy-json.jar:\
:/usr/share/java/slf4j-api.jar:\
@@ -41,7 +42,7 @@ override_dh_auto_build:
cp -Rp provider/src/main/kotlin/* provider/target/classes
cp -Rp provider/src/main/resources/* provider/target/classes
- echo 'projects=\nruntime=annotations-13.0.jar,gradle-kotlin-dsl-tooling-models.jar,kotlin-compiler-embeddable.jar,kotlin-reflect.jar,kotlin-sam-with-receiver-compiler-plugin.jar,kotlin-stdlib.jar,kotlin-stdlib-jdk7.jar,kotlin-stdlib-jdk8.jar' \
+ echo 'projects=\nruntime=annotations-13.0.jar,gradle-kotlin-dsl-tooling-models.jar,kotlin-compiler-embeddable.jar,kotlin-reflect.jar,kotlin-sam-with-receiver-compiler-plugin.jar,kotlin-stdlib.jar,kotlin-stdlib-jdk7.jar,kotlin-stdlib-jdk8.jar,kotlin-script-runtime.jar,trove4j.jar' \
> provider/target/classes/gradle-kotlin-dsl-classpath.properties
jar cf provider/target/gradle-kotlin-dsl.jar -C provider/target/classes/ .
View it on GitLab: https://salsa.debian.org/java-team/gradle-kotlin-dsl/-/compare/880ab049871e4dd703740b4f75b7242b536ccc04...3b12a11e9e9ba53adcf1d33c6266106e33b432a8
--
View it on GitLab: https://salsa.debian.org/java-team/gradle-kotlin-dsl/-/compare/880ab049871e4dd703740b4f75b7242b536ccc04...3b12a11e9e9ba53adcf1d33c6266106e33b432a8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230201/9353bf03/attachment.htm>
More information about the pkg-java-commits
mailing list