diff --git a/build.sbt b/build.sbt index 6dd74ecc11..41df6cccbf 100644 --- a/build.sbt +++ b/build.sbt @@ -148,7 +148,7 @@ lazy val root = project .configure(baseSettings) .aggregate(logging, core, phases, ts, scalajs, `importer-portable`, `sbt-converter`, importer, cli) -lazy val scala212 = "2.12.20" +lazy val scala212 = "2.13.17" lazy val scala3 = "3.3.4" lazy val baseSettings: Project => Project = diff --git a/core/src/main/scala/org/scalablytyped/converter/internal/StableHash.scala b/core/src/main/scala/org/scalablytyped/converter/internal/StableHash.scala index a0d0c0cba2..951b287ee5 100644 --- a/core/src/main/scala/org/scalablytyped/converter/internal/StableHash.scala +++ b/core/src/main/scala/org/scalablytyped/converter/internal/StableHash.scala @@ -1,6 +1,7 @@ package org.scalablytyped.converter.internal import java.lang.Integer.{rotateLeft => rotl} +import scala.IterableOnce /** Marker trait for types that implement stable hashing in their hashCode method. * @@ -305,7 +306,7 @@ object StableHash { finalizeHash(h, n) } - private def orderedHash(xs: TraversableOnce[Any], seed: Int): Int = + private def orderedHash(xs: IterableOnceIterableOnce[Any], seed: Int): Int = if (xs.isEmpty) { finalizeHash(seed, 0) } else { diff --git a/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterGenSourcePlugin.scala b/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterGenSourcePlugin.scala index c67a2d9e0f..ca2696b75e 100644 --- a/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterGenSourcePlugin.scala +++ b/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedConverterGenSourcePlugin.scala @@ -37,7 +37,7 @@ object ScalablyTypedConverterGenSourcePlugin extends AutoPlugin { }, Keys.libraryDependencies ++= { val conversion = stConversionOptions.value - conversion.flavourImpl.dependencies.map(dep => Utils.asModuleID(dep.concrete(conversion.versions))).to[Seq] + conversion.flavourImpl.dependencies.map(dep => Utils.asModuleID(dep.concrete(conversion.versions))).to(Seq) }, stMinimize := Selection.None, stMinimizeKeep := Nil, @@ -94,7 +94,7 @@ object ScalablyTypedConverterGenSourcePlugin extends AutoPlugin { os.Path(globalCacheDir), ) match { case Right(files) => - val seqFiles = files.to[Seq] + val seqFiles = files.to(Seq) Json.persist(cachedInputs)(input) Json.persist(cachedOutputs)(seqFiles) seqFiles diff --git a/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala b/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala index 3af4c263b8..f595e69c94 100644 --- a/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala +++ b/sbt-converter/src/main/scala/org/scalablytyped/converter/plugin/ScalablyTypedPluginBase.scala @@ -96,7 +96,7 @@ object ScalablyTypedPluginBase extends AutoPlugin { enableScalaJsDefined = stEnableScalaJsDefined.value.map(TsIdentLibrary.apply), stdLibs = SortedSet.empty ++ stStdlib.value, expandTypeMappings = stInternalExpandTypeMappings.value.map(TsIdentLibrary.apply), - ignored = stIgnore.value.to[Set].sorted, + ignored = stIgnore.value.to(Set).sorted, versions = versions, organization = organization, enableReactTreeShaking = stReactEnableTreeShaking.value.map(name => ImportName(TsIdentLibrary(name))), diff --git a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/TreeTraverse.scala b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/TreeTraverse.scala index 8789dbb349..e742cc4355 100644 --- a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/TreeTraverse.scala +++ b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/TreeTraverse.scala @@ -1,6 +1,7 @@ package org.scalablytyped.converter.internal package scalajs +import scala.IterableOnce object TreeTraverse { def collect[T <: AnyRef](tree: Tree)(extract: PartialFunction[Tree, T]): IArray[T] = collectIArray(IArray(tree))(extract) @@ -21,7 +22,7 @@ object TreeTraverse { def rec(a: Any): Unit = a match { case x: Tree if x ne tree => go(extract, buf)(x) - case xs: TraversableOnce[_] => xs.foreach(rec) + case xs: IterableOnceIterableOnce[_] => xs.foreach(rec) case xs: IArray[_] => xs.foreach(rec) case p: Product => p.productIterator.foreach(rec) case _ => () @@ -36,7 +37,7 @@ object TreeTraverse { def rec(a: Any): Unit = a match { case x: AnyRef if x ne tree => foreach(x)(run) - case xs: TraversableOnce[_] => xs.foreach(rec) + case xs: IterableOnceIterableOnce[_] => xs.foreach(rec) case xs: IArray[_] => xs.foreach(rec) case p: Product => p.productIterator.foreach(rec) case _ => () diff --git a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/Versions.scala b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/Versions.scala index ba7a80200e..0053247563 100644 --- a/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/Versions.scala +++ b/scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/Versions.scala @@ -47,7 +47,7 @@ object Versions { implicit val decodes: Decoder[Scala] = Decoder[String].map(Scala.apply) } - val Scala212 = Scala("2.12.20") + val Scala212 = Scala("2.13.17") val Scala213 = Scala("2.13.16") val Scala3 = Scala("3.3.6") diff --git a/ts/src/main/scala/org/scalablytyped/converter/internal/ts/TsTreeTraverse.scala b/ts/src/main/scala/org/scalablytyped/converter/internal/ts/TsTreeTraverse.scala index f2c7d79fd3..b653dfc708 100644 --- a/ts/src/main/scala/org/scalablytyped/converter/internal/ts/TsTreeTraverse.scala +++ b/ts/src/main/scala/org/scalablytyped/converter/internal/ts/TsTreeTraverse.scala @@ -1,6 +1,7 @@ package org.scalablytyped.converter.internal package ts +import scala.IterableOnce object TsTreeTraverse { def collect[T <: AnyRef](tree: TsTree)(extract: PartialFunction[TsTree, T]): IArray[T] = collectIArray(IArray(tree))(extract) @@ -22,7 +23,7 @@ object TsTreeTraverse { a match { case x: TsTree if x ne tree => go(extract, buf)(x) - case xs: TraversableOnce[_] => + case xs: IterableOnceIterableOnce[_] => val it = xs.toIterator while (it.hasNext) { rec(it.next())