You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fory.apache.org by ch...@apache.org on 2025/10/21 10:39:24 UTC

(fory) 04/04: fix scala build

This is an automated email from the ASF dual-hosted git repository.

chaokunyang pushed a commit to branch releases-0.13.0
in repository https://gitbox.apache.org/repos/asf/fory.git

commit 34681019d7ecc1d5bb21e971c37a616f8b823790
Author: chaokunyang <sh...@gmail.com>
AuthorDate: Tue Oct 21 18:22:22 2025 +0800

    fix scala build
---
 scala/build.sbt                                          |  2 +-
 scala/project/build.properties                           |  2 +-
 .../fory/serializer/scala/CollectionSerializer.scala     | 16 +---------------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/scala/build.sbt b/scala/build.sbt
index 40af150ce..ad350e8a1 100644
--- a/scala/build.sbt
+++ b/scala/build.sbt
@@ -21,7 +21,7 @@ val scala213Version = "2.13.15"
 ThisBuild / apacheSonatypeProjectProfile := "fory"
 version := foryVersion
 scalaVersion := scala213Version
-crossScalaVersions := Seq(scala213Version, "3.3.4")
+crossScalaVersions := Seq(scala213Version, "3.3.1")
 
 lazy val root = Project(id = "fory-scala", base = file("."))
   .settings(
diff --git a/scala/project/build.properties b/scala/project/build.properties
index ab2e727d9..c12725b41 100644
--- a/scala/project/build.properties
+++ b/scala/project/build.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-sbt.version=1.11.2
+sbt.version=1.9.9
diff --git a/scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala b/scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala
index b9274a1ec..707eba5c5 100644
--- a/scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala
+++ b/scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala
@@ -70,8 +70,6 @@ abstract class AbstractScalaCollectionSerializer[A, T <: Iterable[A]](fory: Fory
 
 /**
  * A Iterable adapter to wrap scala iterable into a [[java.lang.Iterable]].
- *
- *
  */
 private trait JavaIterable[A] extends java.lang.Iterable[A] {
   override def iterator(): util.Iterator[A] = new util.Iterator[A] {
@@ -87,8 +85,6 @@ private trait JavaIterable[A] extends java.lang.Iterable[A] {
 
 /**
  * A Collection adapter which wrap scala iterable into a [[java.util.Collection]].
- *
- *
  */
 private class CollectionAdapter[A, T](coll: scala.collection.Iterable[A])
   extends util.AbstractCollection[A] with JavaIterable[A] {
@@ -108,8 +104,6 @@ private class CollectionAdapter[A, T](coll: scala.collection.Iterable[A])
 
 /**
  * A List adapter which wrap scala Seq into a [[java.util.List]].
- *
- *
  */
 private class ListAdapter[A](coll: scala.collection.Seq[A])
   extends util.AbstractList[A] with JavaIterable[A] {
@@ -124,8 +118,6 @@ private class ListAdapter[A](coll: scala.collection.Seq[A])
 
 /**
  * A Collection adapter which build scala collection from elements.
- *
- *
  */
 private class JavaCollectionBuilder[A, T](val builder: mutable.Builder[A, T])
   extends util.AbstractCollection[A] {
@@ -141,8 +133,6 @@ private class JavaCollectionBuilder[A, T](val builder: mutable.Builder[A, T])
 
 /**
  * Serializer for scala iterables.
- *
- *
  */
 class ScalaCollectionSerializer[A, T <: Iterable[A]] (fory: Fory, cls: Class[T])
   extends AbstractScalaCollectionSerializer[A, T](fory, cls) {
@@ -157,8 +147,6 @@ class ScalaCollectionSerializer[A, T <: Iterable[A]] (fory: Fory, cls: Class[T])
 
 /**
  * Serializer for scala sorted set.
- *
- *
  */
 class ScalaSortedSetSerializer[A, T <: scala.collection.SortedSet[A]](fory: Fory, cls: Class[T])
   extends AbstractScalaCollectionSerializer[A, T](fory, cls) {
@@ -172,9 +160,7 @@ class ScalaSortedSetSerializer[A, T <: scala.collection.SortedSet[A]](fory: Fory
 }
 
 /**
- * Serializer for scala [[Seq]].
- *
- *
+ * Serializer for scala Seq.
  */
 class ScalaSeqSerializer[A, T <: scala.collection.Seq[A]](fory: Fory, cls: Class[T])
   extends AbstractScalaCollectionSerializer[A, T](fory, cls)  {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@fory.apache.org
For additional commands, e-mail: commits-help@fory.apache.org