feat: possibility to bundle the jdk when building scripts

MoonLightSuite · Dec 9, 2023 · 5f4e7ad · 5f4e7ad
1 parent bef9084
commit 5f4e7ad
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 14 deletions.
diff --git a/build-logic/publish/build.gradle.kts b/build-logic/publish/build.gradle.kts
@@ -0,0 +1,9 @@
+// == Plugins for publishing to Maven Central ==
+plugins {
+    `kotlin-dsl`    // To compile the plugin code
+    id("com.vanniktech.maven.publish") version "0.25.3"
+}
+
+dependencies {
+    implementation("com.vanniktech:gradle-maven-publish-plugin:0.25.3")
+}
diff --git a/....github.moonlightsuite.publish.gradle.kts → ....github.moonlightsuite.publish.gradle.kts b/....github.moonlightsuite.publish.gradle.kts → ....github.moonlightsuite.publish.gradle.kts
@@ -1,10 +1,22 @@
 import com.vanniktech.maven.publish.SonatypeHost
 
 plugins {
-    id("io.github.moonlightsuite.java-library")
+    `java-library`
+//    id("io.github.moonlightsuite.java-library")
     id("com.vanniktech.maven.publish")
 }
 
+// == General Java settings ==
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+//    withJavadocJar()
+//    withSourcesJar()
+}
+
 val projectVersion: String = try {
     val ver = providers.gradleProperty("projectVersion").get()
     if (ver.contains("-")) {

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
     }
 
     plugins {
-        kotlin("jvm") version "1.9.21" apply false         // for compiling the docs
+//        kotlin("jvm") version "1.9.21" apply false         // for compiling the docs
         id("org.jetbrains.dokka") version "1.9.10" apply false
     }
 }
@@ -26,10 +26,11 @@ dependencyResolutionManagement {
 plugins {
     `kotlin-dsl` apply false
 
-    kotlin("jvm") version "1.9.20-RC2" apply false // TODO: remove when 1.9.20 is released
+//    kotlin("jvm") version "1.9.21" apply false // TODO: remove when 1.9.20 is released
 }
 
 // We aggregate all the build logic in a single project
 include("java-library")
+include("publish")
 include("code-info")
 include("generate-docs")
diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("io.github.moonlightsuite.java-library")
-    id("io.github.moonlightsuite.generate-docs")
+//    id("io.github.moonlightsuite.generate-docs")
     id("io.github.moonlightsuite.publish")
 }
 

diff --git a/engine/src/main/java/module-info.java b/engine/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 module moonlight.engine {
-    requires org.jetbrains.annotations;
+    requires static org.jetbrains.annotations;
     requires com.google.gson;
     requires org.apache.logging.log4j;
     requires org.apache.logging.log4j.core;

diff --git a/script/build.gradle.kts b/script/build.gradle.kts
@@ -1,8 +1,16 @@
 plugins {
     antlr
     id("io.github.moonlightsuite.java-library")
-    id("io.github.moonlightsuite.generate-docs")
+//    id("io.github.moonlightsuite.generate-docs")
     id("io.github.moonlightsuite.publish")
+    id("org.beryx.jlink") version "3.0.1"
+}
+
+jlink {
+    launcher {
+        name = "moonlight"
+        jvmArgs = listOf("-Dlogback.configurationFile=./logback.xml")
+    }
 }
 
 dependencies {
@@ -24,11 +32,11 @@ tasks.generateGrammarSource {
 tasks.build {
     dependsOn(tasks.generateGrammarSource)
 }
-
-tasks.kotlinSourcesJar {
-    dependsOn(tasks.generateGrammarSource)
-}
-
-tasks.dokkaHtml {
-    dependsOn(tasks.generateGrammarSource)
-}
+//
+//tasks.kotlinSourcesJar {
+//    dependsOn(tasks.generateGrammarSource)
+//}
+//
+//tasks.dokkaHtml {
+//    dependsOn(tasks.generateGrammarSource)
+//}