chore: general cleanup

MoonLightSuite · Dec 9, 2023 · ef6cc3a · ef6cc3a
1 parent 4b56bb1
commit ef6cc3a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 28 deletions.
diff --git a/build-logic/publish/src/main/kotlin/io.github.moonlightsuite.publish.gradle.kts b/build-logic/publish/src/main/kotlin/io.github.moonlightsuite.publish.gradle.kts
@@ -6,17 +6,6 @@ plugins {
     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,6 @@ pluginManagement {
     }
 
     plugins {
-//        kotlin("jvm") version "1.9.21" apply false         // for compiling the docs
         id("org.jetbrains.dokka") version "1.9.10" apply false
     }
 }
@@ -25,8 +24,6 @@ dependencyResolutionManagement {
 // Required to remove annoying warning in subprojects
 plugins {
     `kotlin-dsl` apply false
-
-//    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

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/script/build.gradle.kts b/script/build.gradle.kts
@@ -1,14 +1,14 @@
 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"
+        name = "moonlight.script"
         jvmArgs = listOf("-Dlogback.configurationFile=./logback.xml")
     }
 }
@@ -33,14 +33,6 @@ tasks.withType<Jar>().configureEach {
     dependsOn(tasks.withType<AntlrTask>())
 }
 
-//tasks.named("sourcesJar") {
-//    dependsOn(tasks.generateGrammarSource)
-//}
-//
-//tasks.kotlinSourcesJar {
-//    dependsOn(tasks.generateGrammarSource)
-//}
-//
-//tasks.dokkaHtml {
-//    dependsOn(tasks.generateGrammarSource)
-//}
+tasks.dokkaHtml {
+    dependsOn(tasks.generateGrammarSource)
+}