Fix typos and update Scala 3 example to latest Scala version.

Jannyboy11 · Dec 25, 2024 · c203fcb · c203fcb
1 parent 6ddc342
commit c203fcb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/...a2Example/src/main/scala/xyz/janboerman/scalaloader/example/scala/SerializationTest.scala b/...a2Example/src/main/scala/xyz/janboerman/scalaloader/example/scala/SerializationTest.scala
@@ -172,7 +172,7 @@ case object NoValue extends Maybe[scala.Nothing] {
 //    def serialize(): java.util.Map[String, AnyRef] = {
 //        val map = new java.util.HashMap[String, AnyRef]()
 //        map.putAll($serialize())
-//        map.put("$variant", "Nothing" /*or or the class name in case there was no alias*/)
+//        map.put("$variant", "Nothing" /*or, the class name in case there was no alias*/)
 //        return map;
 //    }
 //

diff --git a/Scala3Example/pom.xml b/Scala3Example/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <scala.boostrapVersion>2.13.12</scala.boostrapVersion>
-        <scala.version>3.3.1</scala.version>
+        <scala.version>3.6.2</scala.version>
     </properties>
 
     <build>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <version>1.21.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/Scala3Example/src/main/resources/plugin.yml b/Scala3Example/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Scala3Example
 version: ${project.version}
-api-version: "1.19"
+api-version: "1.21"
 folia-supported: true
 load: STARTUP
 

diff --git a/Scala3Example/src/main/scala/xyz/janboerman/scalaloader/example/scala3/CollectionTest.scala b/Scala3Example/src/main/scala/xyz/janboerman/scalaloader/example/scala3/CollectionTest.scala
@@ -6,7 +6,6 @@ import org.bukkit.configuration.file.YamlConfiguration
 import java.io.File
 import xyz.janboerman.scalaloader.configurationserializable.{ConfigurationSerializable, Scan}
 
-import java.lang.annotation.Annotation
 import scala.collection.immutable.{ArraySeq, SortedSet}
 import scala.collection.mutable
 

diff --git a/Scala3Example/src/main/scala/xyz/janboerman/scalaloader/example/scala3/ExamplePlugin.scala b/Scala3Example/src/main/scala/xyz/janboerman/scalaloader/example/scala3/ExamplePlugin.scala
@@ -5,7 +5,7 @@ import xyz.janboerman.scalaloader.plugin.description.{Api, ApiVersion, Scala, Sc
 import xyz.janboerman.scalaloader.plugin.{ScalaPlugin, ScalaPluginDescription}
 import zio.{ZIO, Console}
 
-@Scala(ScalaVersion.v3_2_0)
+@Scala(version = ScalaVersion.v3_6_2)
 object ExamplePlugin extends ScalaPlugin {
 
     var syncRuntime = new BukkitRuntime(this).syncRuntime

diff --git a/...main/java/xyz/janboerman/scalaloader/configurationserializable/DelegateSerialization.java b/...main/java/xyz/janboerman/scalaloader/configurationserializable/DelegateSerialization.java
@@ -44,7 +44,7 @@
     Class<?>[] value() default {};
 
     /**
-     * With what alias should the top type have?
+     * What alias should the top type have?
      * @return the alias
      */
     String as() default "";