Replace semver4j with maven-artifact and remove library jars from the…

… git repo. (#1775)

* Replace semver4j with maven-artifact.

* Exclude manifest files of dependencies from the launcher fat jar.

* Add a gradle task that extracts all dependency jars so that we don't have to keep the jars in git.

README.md

@@ -218,9 +218,6 @@ Chunky uses the following 3rd party libraries:
   See the file `licenses/Apache-2.0.txt` for the full license text.
   See the file `licenses/lz4-java.txt` for the copyright notice.
   lz4-java uses LZ4, by Yann Collet, which is covered by the BSD 2-Clause license. See the file `licenses/lz4.txt` for the copyright notice and full license.
-- **Semver4j by Vincent Durmont**
-  The library is covered by the MIT License.
-  See the file `licenses/semver4j.txt` for the copyright notice.
 
 ## Special Thanks
 

chunky/build.gradle

@@ -10,6 +10,13 @@ configurations {
   implementation.extendsFrom configurations.nbtlib
   implementation.extendsFrom configurations.cplib
   implementation.extendsFrom configurations.toolpanelib
+
+  // dependencies that are not bundled with chunky-core but downloaded separately by the launcher
+  externalDependencies {
+    extendsFrom configurations.implementation
+    exclude group: "se.llbit" // bundled in chunky-core
+    exclude group: "org.openjfx" // provided at runtime
+  }
 }
 
 dependencies {
@@ -104,6 +111,11 @@ task sourcesJar(type: Jar) {
   archiveClassifier.set('sources')
 }
 
+task copyExternalDependencies(type: Copy) {
+  into "${buildDir}/${libsDirName}"
+  from configurations.externalDependencies
+}
+
 artifacts {
   archives javadocJar, sourcesJar
 }

chunky/src/java/se/llbit/chunky/ui/controller/CreditsController.java

@@ -79,10 +79,6 @@ public class CreditsController implements Initializable {
   @FXML
   private Hyperlink simplexnoiseLicense;
   @FXML
-  private Hyperlink semver4j;
-  @FXML
-  private Hyperlink semver4jLicense;
-  @FXML
   private Hyperlink lz4Java;
   @FXML
   private Hyperlink lz4JavaLicense;
@@ -188,11 +184,6 @@ public void initialize(URL location, ResourceBundle resources) {
     simplexnoiseLicense.setBorder(Border.EMPTY);
     simplexnoiseLicense.setOnAction(e -> launchAndReset(simplexnoiseLicense, "https://unlicense.org/"));
 
-    semver4j.setBorder(Border.EMPTY);
-    semver4j.setOnAction(e -> launchAndReset(semver4j, "https://github.com/vdurmont/semver4j"));
-    semver4jLicense.setBorder(Border.EMPTY);
-    semver4jLicense.setOnAction(e -> launchAndReset(semver4jLicense, "https://github.com/vdurmont/semver4j/blob/master/LICENSE.md"));
-
     lz4Java.setBorder(Border.EMPTY);
     lz4Java.setOnAction(e -> launchAndReset(lz4Java, "https://github.com/lz4/lz4-java"));
     lz4JavaLicense.setBorder(Border.EMPTY);

chunky/src/res/se/llbit/chunky/ui/dialogs/Credits.fxml

@@ -236,20 +236,6 @@
                       </padding>
                     </Hyperlink>
 
-                    <Hyperlink fx:id="semver4j" text="semver4j">
-                      <padding>
-                        <Insets/>
-                      </padding>
-                    </Hyperlink>
-                    <Hyperlink fx:id="semver4jLicense" text="MIT License">
-                      <font>
-                        <Font size="10.0" />
-                      </font>
-                      <padding>
-                        <Insets left="20.0" />
-                      </padding>
-                    </Hyperlink>
-
                     <Hyperlink fx:id="lz4Java" text="lz4-java">
                       <padding>
                         <Insets/>

launcher/build.gradle

@@ -9,7 +9,7 @@ configurations {
 }
 
 dependencies {
-    bundled 'com.vdurmont:semver4j:3.1.0'
+    bundled 'org.apache.maven:maven-artifact:3.9.9'
 
     implementation project(':lib')
 }
@@ -44,5 +44,7 @@ jar {
     // Include other dependencies
     from {
         configurations.bundled.collect { it.isDirectory() ? it : zipTree(it) }
+    } {
+      exclude "META-INF/*"
     }
 }

launcher/src/se/llbit/chunky/launcher/ChunkyLauncher.java

@@ -17,8 +17,9 @@
  */
 package se.llbit.chunky.launcher;
 
-import com.vdurmont.semver4j.Semver;
 import javafx.stage.Stage;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import se.llbit.chunky.PersistentSettings;
 import se.llbit.chunky.launcher.ui.ChunkyLauncherFx;
 import se.llbit.chunky.launcher.ui.DebugConsole;
@@ -46,7 +47,8 @@
  */
 public class ChunkyLauncher {
 
-  public static final Semver LAUNCHER_VERSION = new Semver("1.14.0");
+  public static final ArtifactVersion LAUNCHER_VERSION = new DefaultArtifactVersion("1.14.0");
+
   public static final int LAUNCHER_SETTINGS_REVISION = 1;
 
   /**

launcher/src/se/llbit/chunky/launcher/LauncherInfo.java

@@ -16,7 +16,8 @@
  */
 package se.llbit.chunky.launcher;
 
-import com.vdurmont.semver4j.Semver;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import se.llbit.json.JsonArray;
 import se.llbit.json.JsonObject;
 import se.llbit.json.JsonValue;
@@ -32,7 +33,7 @@ public class LauncherInfo {
     public final String path;
 
     public final Date date;
-    public final Semver version;
+    public final ArtifactVersion version;
 
     public final Map<String, ReleaseChannel> channels = new LinkedHashMap<>();
 
@@ -46,7 +47,7 @@ public LauncherInfo() {
     }
 
     public LauncherInfo(JsonObject obj) {
-        version = new Semver(obj.get("name").stringValue(""));
+        version = new DefaultArtifactVersion(obj.get("name").stringValue(""));
         notes = obj.get("notes").stringValue("");
         path = obj.get("path").stringValue("ChunkyLauncher.jar");
         date = Util.dateFromISO8601(obj.get("timestamp").stringValue(""));

launcher/src/se/llbit/chunky/launcher/ui/ChunkyLauncherController.java

@@ -279,7 +279,7 @@ public void updateLauncher(Consumer<String> errorCallback, Consumer<LauncherInfo
         errorCallback,
         info -> {
           if (info != null) {
-            if (info.version.isGreaterThan(ChunkyLauncher.LAUNCHER_VERSION)) {
+            if (info.version.compareTo(ChunkyLauncher.LAUNCHER_VERSION) > 0) {
               Platform.runLater(() -> {
                 try {
                   LauncherUpdateDialog updateDialog = new LauncherUpdateDialog(settings, info);