Skip to content

Commit 3468101

Browse files
committed
fix scala build
1 parent 0b04d52 commit 3468101

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

scala/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ val scala213Version = "2.13.15"
2121
ThisBuild / apacheSonatypeProjectProfile := "fory"
2222
version := foryVersion
2323
scalaVersion := scala213Version
24-
crossScalaVersions := Seq(scala213Version, "3.3.4")
24+
crossScalaVersions := Seq(scala213Version, "3.3.1")
2525

2626
lazy val root = Project(id = "fory-scala", base = file("."))
2727
.settings(

scala/project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
sbt.version=1.11.2
18+
sbt.version=1.9.9

scala/src/main/scala/org/apache/fory/serializer/scala/CollectionSerializer.scala

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ abstract class AbstractScalaCollectionSerializer[A, T <: Iterable[A]](fory: Fory
7070

7171
/**
7272
* A Iterable adapter to wrap scala iterable into a [[java.lang.Iterable]].
73-
*
74-
*
7573
*/
7674
private trait JavaIterable[A] extends java.lang.Iterable[A] {
7775
override def iterator(): util.Iterator[A] = new util.Iterator[A] {
@@ -87,8 +85,6 @@ private trait JavaIterable[A] extends java.lang.Iterable[A] {
8785

8886
/**
8987
* A Collection adapter which wrap scala iterable into a [[java.util.Collection]].
90-
*
91-
*
9288
*/
9389
private class CollectionAdapter[A, T](coll: scala.collection.Iterable[A])
9490
extends util.AbstractCollection[A] with JavaIterable[A] {
@@ -108,8 +104,6 @@ private class CollectionAdapter[A, T](coll: scala.collection.Iterable[A])
108104

109105
/**
110106
* A List adapter which wrap scala Seq into a [[java.util.List]].
111-
*
112-
*
113107
*/
114108
private class ListAdapter[A](coll: scala.collection.Seq[A])
115109
extends util.AbstractList[A] with JavaIterable[A] {
@@ -124,8 +118,6 @@ private class ListAdapter[A](coll: scala.collection.Seq[A])
124118

125119
/**
126120
* A Collection adapter which build scala collection from elements.
127-
*
128-
*
129121
*/
130122
private class JavaCollectionBuilder[A, T](val builder: mutable.Builder[A, T])
131123
extends util.AbstractCollection[A] {
@@ -141,8 +133,6 @@ private class JavaCollectionBuilder[A, T](val builder: mutable.Builder[A, T])
141133

142134
/**
143135
* Serializer for scala iterables.
144-
*
145-
*
146136
*/
147137
class ScalaCollectionSerializer[A, T <: Iterable[A]] (fory: Fory, cls: Class[T])
148138
extends AbstractScalaCollectionSerializer[A, T](fory, cls) {
@@ -157,8 +147,6 @@ class ScalaCollectionSerializer[A, T <: Iterable[A]] (fory: Fory, cls: Class[T])
157147

158148
/**
159149
* Serializer for scala sorted set.
160-
*
161-
*
162150
*/
163151
class ScalaSortedSetSerializer[A, T <: scala.collection.SortedSet[A]](fory: Fory, cls: Class[T])
164152
extends AbstractScalaCollectionSerializer[A, T](fory, cls) {
@@ -172,9 +160,7 @@ class ScalaSortedSetSerializer[A, T <: scala.collection.SortedSet[A]](fory: Fory
172160
}
173161

174162
/**
175-
* Serializer for scala [[Seq]].
176-
*
177-
*
163+
* Serializer for scala Seq.
178164
*/
179165
class ScalaSeqSerializer[A, T <: scala.collection.Seq[A]](fory: Fory, cls: Class[T])
180166
extends AbstractScalaCollectionSerializer[A, T](fory, cls) {

0 commit comments

Comments
 (0)