Update Scala3 example to Scala 3.8.

Author: Jannyboy11

Scala3Example/pom.xml

@@ -12,8 +12,9 @@
     <artifactId>Scala3Example</artifactId>
 
     <properties>
-        <scala.boostrapVersion>2.13.15</scala.boostrapVersion>
-        <scala.version>3.6.2</scala.version>
+        <!-- Scala 2.13 bootstrap library no longer necessary after Scala 3.8 -->
+<!--        <scala.boostrapVersion>2.13.18</scala.boostrapVersion>-->
+        <scala.version>3.8.3</scala.version>
     </properties>
 
     <build>
@@ -82,17 +83,17 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>${scala.boostrapVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala3-library_3</artifactId>
             <version>${scala.version}</version>
             <scope>provided</scope>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>org.scala-lang</groupId>-->
+<!--            <artifactId>scala3-library_3</artifactId>-->
+<!--            <version>${scala.version}</version>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
+
 <!--        <dependency>-->
 <!--            <groupId>org.scala-lang</groupId>-->
 <!--            <artifactId>tasty-core3_${scala.version}</artifactId>-->

ScalaLoader-Common/src/main/java/xyz/janboerman/scalaloader/dependency/LibraryClassLoader.java

@@ -62,7 +62,7 @@ public void addURL(URL url) {
      * loadClass(String name) is not overridden and that is very much intentional.
      * why? because the load-class method defines the search order.
      * and the default behaviour is ideal for us: we want to search in the parent classloader first!
-     * why do we want to find classes first in the parent cloassloader?
+     * why do we want to find classes first in the parent classloader?
      * because we want to use the use same class definitions for scala standard library types and bukkit types as the scalaplugins themselves.
      * so we shouldn't load those classes from a downloaded jar file.
      */

ScalaLoader-Paper/src/main/java/xyz/janboerman/scalaloader/paper/plugin/ScalaPluginLoader.java

@@ -89,19 +89,28 @@ private static List<String> mavenDependencies(String scalaVersion) {
                     "org.scala-lang:scala-reflect:" + scalaVersion);
 
         boolean isScala3 = scalaVersion.startsWith("3.");
-        if (isScala3)
-            if ("3.0.0".equals(scalaVersion))
+        if (isScala3) {
+            if ("3.0.0".equals(scalaVersion)) {
                 return listOf(
                         "org.scala-lang:scala-library:" + ScalaVersion.getLatest_2_13().getVersion(),
                         "org.scala-lang:scala-reflect:" + ScalaVersion.getLatest_2_13().getVersion(),
                         "org.scala-lang:scala3-library_3.0.0-nonbootstrapped:3.0.0",
                         "org.scala-lang:tasty-core_3.0.0-nonbootstrapped:3.0.0");
-            else
-                return listOf(
-                        "org.scala-lang:scala-library:" + ScalaVersion.getLatest_2_13().getVersion(),
-                        "org.scala-lang:scala-reflect:" + ScalaVersion.getLatest_2_13().getVersion(),
-                        "org.scala-lang:scala3-library_3:" + scalaVersion,
-                        "org.scala-lang:tasty-core_3:" + scalaVersion);
+            } else {
+                int minor = Integer.parseInt(scalaVersion.split("\\.")[1]);
+                if (minor < 8) {
+                    return listOf(
+                            "org.scala-lang:scala-library:" + ScalaVersion.getLatest_2_13().getVersion(),
+                            "org.scala-lang:scala-reflect:" + ScalaVersion.getLatest_2_13().getVersion(),
+                            "org.scala-lang:scala3-library_3:" + scalaVersion,
+                            "org.scala-lang:tasty-core_3:" + scalaVersion);
+                } else {
+                    return listOf(
+                            "org.scala-lang:scala-library:" + scalaVersion,
+                            "org.scala-lang:tasty-core_3:" + scalaVersion);
+                }
+            }
+        }
 
         throw new RuntimeException("Unrecognised Scala version: " + scalaVersion);
     }

ScalaLoader-Paper/src/main/java/xyz/janboerman/scalaloader/paper/plugin/description/ScalaDependency.java

@@ -12,13 +12,15 @@ public sealed interface ScalaDependency extends IScalaVersion permits Builtin, C
 
     public String getVersionString();
 
+    /** Scala version defined using annotation @Scala(version = ScalaVersion.X_Y_Z)*/
     public static record Builtin(ScalaVersion scalaVersion) implements ScalaDependency {
         @Override
         public String getVersionString() {
             return scalaVersion().getVersion();
         }
     }
 
+    /** Scala version defined using annotation @CustomScala */
     public static record Custom(String scalaVersion, Map<String, String> urls, Map<String, String> sha1hashes) implements ScalaDependency {
         /** @deprecated Use canonical constructor instead. */
         @Deprecated
@@ -32,6 +34,7 @@ public String getVersionString() {
         }
     }
 
+    /** Scala version defined in the plugin.yml under the "scala-version" key. */
     public static record YamlDefined(String scalaVersion) implements ScalaDependency {
         @Override
         public String getVersionString() {