Add module descriptor inside multi-release jar (Fixes #21) (#23)

Author: A248

.travis.yml

@@ -1,7 +1,7 @@
 dist: bionic
 
 language: java
-jdk: openjdk8
+jdk: openjdk11
 
 install: true
 script: ./gradlew build

build.gradle.kts

@@ -8,6 +8,16 @@ plugins {
 
 base.archivesName(project.name.toLowerCase())
 
+sourceSets.create("java11") {
+    java.srcDir("src/main/java11")
+    java.srcDir("src/main/java")
+}
+
+sourceSets.create("intTest")
+
+configurations["java11CompileClasspath"].extendsFrom(configurations.compileClasspath.get())
+configurations["intTestImplementation"].extendsFrom(configurations.api.get())
+
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
 }
@@ -17,15 +27,16 @@ repositories {
 }
 
 dependencies {
-    api("org.apache.logging.log4j:log4j-core:2.8.1")
-    annotationProcessor("org.apache.logging.log4j:log4j-core:2.8.1")
+    api("org.apache.logging.log4j:log4j-core:2.14.1")
+    annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1")
 
     api("org.jline:jline-reader:3.20.0")
 
     compileOnly("org.checkerframework:checker-qual:3.17.0")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
+    "intTestImplementation"(files(tasks.named("jar")))
 }
 
 java {
@@ -36,13 +47,33 @@ java {
 tasks.jar {
     manifest {
         attributes("Automatic-Module-Name" to "net.minecrell.terminalconsole")
+        attributes("Multi-Release" to "true")
+    }
+    into("META-INF/versions/11") {
+        from(sourceSets["java11"].output)
+        include("module-info.class")
     }
 }
 
+tasks.named<JavaCompile>("compileJava") {
+    options.release.set(8)
+}
+
+tasks.named<JavaCompile>("compileJava11Java") {
+    options.release.set(11)
+    options.javaModuleVersion.set(project.version as String)
+}
+
+tasks.named<JavaCompile>("compileIntTestJava") {
+    options.release.set(11)
+}
+
 tasks.withType<Test> {
     useJUnitPlatform()
 }
 
+tasks.check { dependsOn(tasks.named("compileIntTestJava")) }
+
 val isSnapshot = version.toString().endsWith("-SNAPSHOT")
 
 publishing {

src/intTest/java/module-info.java

@@ -0,0 +1,27 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Minecrell <https://github.com/Minecrell>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+module net.minecrell.terminalconsole.it {
+    requires net.minecrell.terminalconsole;
+}

src/intTest/java/net/minecrell/terminalconsole/it/jpms/Compilation.java

@@ -0,0 +1,35 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Minecrell <https://github.com/Minecrell>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package net.minecrell.terminalconsole.it.jpms;
+
+import org.apache.logging.log4j.core.LogEvent;
+import net.minecrell.terminalconsole.TerminalConsoleAppender;
+
+public class Compilation {
+
+    public void useTCA(TerminalConsoleAppender tca) {
+        tca.append((LogEvent) null);    
+    }
+}

src/main/java11/module-info.java

@@ -0,0 +1,34 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Minecrell <https://github.com/Minecrell>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+module net.minecrell.terminalconsole {
+    requires org.apache.logging.log4j;
+    requires transitive org.apache.logging.log4j.core;
+    requires static org.checkerframework.checker.qual;
+    requires transitive org.jline.terminal;
+    requires transitive org.jline.reader;
+
+    exports net.minecrell.terminalconsole;
+    exports net.minecrell.terminalconsole.util;
+}