Add exact gui jar file to the classpath instead of a wildcard

With the wildcard IntelliJ would only add the gui jar to the classpath after
a reload of the sbt project, because the gui jar does only exist after
an advanced build, but not at the normal import time.

With this commit IntelliJ will try to add the jar on the first reload/import
even tho it currently doesn't exist. That's not a problem, IntelliJ
will just ignore the nonexistent jar and once the advanced build has been
run IntelliJ will add the jar to the classpath without a reload.

Note that a reload is still required after the gui version number has changed!

This commit also drops the scala version suffix in the name of the gui jar
because it doesn't contain any scala code and having the scala suffix
in the name does not make any sense.

Author: hlxid

build.sbt

@@ -136,11 +136,11 @@ deployDev := BootstrapUtility.prepareDevDeploymentTask(streams.value.log, scalaM
 gui := new GUIUtility(streams.value.log).guiTask(guiProjectPath.value, streams.value.cacheDirectory / "gui")
 
 Compile / packageBin := {
-  new GUIUtility(streams.value.log).packageGUITask(guiProjectPath.value, scalaMajorVersion, crossTarget.value)
+  new GUIUtility(streams.value.log).packageGUITask(guiProjectPath.value, crossTarget.value)
   (Compile / packageBin).value
 }
 
-Compile / unmanagedJars := (crossTarget.value ** "chatoverflow-gui*.jar").classpath
+Compile / unmanagedJars := new GUIUtility(streams.value.log).getGUIJarClasspath(guiProjectPath.value, crossTarget.value)
 packageBin / includePom := false
 
 fork in run := true // Start ChatOverflow in it's own java process when starting it with 'sbt run'

build/src/main/scala/org/codeoverflow/chatoverflow/build/GUIUtility.scala

@@ -5,7 +5,8 @@ import java.util.jar.Manifest
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.codeoverflow.chatoverflow.build.BuildUtils.withTaskInfo
-import sbt.internal.util.ManagedLogger
+import sbt.Keys.Classpath
+import sbt.internal.util.{Attributed, ManagedLogger}
 import sbt.util.{FileFunction, FilesInfo}
 
 import scala.io.Source
@@ -88,7 +89,7 @@ class GUIUtility(logger: ManagedLogger) {
     }
   }
 
-  def packageGUITask(guiProjectPath: String, scalaMajorVersion: String, crossTargetDir: File): Unit = {
+  def packageGUITask(guiProjectPath: String, crossTargetDir: File): Unit = {
     val dir = new File(guiProjectPath, "dist")
     if (!dir.exists()) {
       logger info "GUI hasn't been compiled. Won't create a jar for it."
@@ -100,9 +101,16 @@ class GUIUtility(logger: ManagedLogger) {
     // contains tuples with the actual file as the first value and the name with directory in the jar as the second value
     val jarEntries = files.map(file => file -> s"/chatoverflow-gui/${dir.toURI.relativize(file.toURI).toString}")
 
-    val guiVersion = getGUIVersion(guiProjectPath).getOrElse("unknown")
+    sbt.IO.jar(jarEntries, getGUIJarFile(guiProjectPath, crossTargetDir), new Manifest())
+  }
 
-    sbt.IO.jar(jarEntries, new File(crossTargetDir, s"chatoverflow-gui_$scalaMajorVersion-$guiVersion.jar"), new Manifest())
+  def getGUIJarClasspath(guiProjectPath: String, crossTargetDir: File): Classpath = {
+    Attributed.blankSeq(Seq(getGUIJarFile(guiProjectPath, crossTargetDir)))
+  }
+
+  private def getGUIJarFile(guiProjectPath: String, crossTargetDir: File): File = {
+    val guiVersion = getGUIVersion(guiProjectPath).getOrElse("unknown")
+    new File(crossTargetDir, s"chatoverflow-gui-$guiVersion.jar")
   }
 
   private def getGUIVersion(guiProjectPath: String): Option[String] = {