WIP WIP WIP 1.10.2->3

scala · Oct 24, 2024 · 508b1bd · 508b1bd
1 parent 077980b
commit 508b1bd
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.github/Dockerfile b/.github/Dockerfile
@@ -21,5 +21,5 @@ RUN apt-get update && \
 # Install sbt
 ENV SBT_HOME /usr/local/sbt
 ENV PATH ${SBT_HOME}/bin:${PATH}
-ENV SBT_VERSION 1.10.2
+ENV SBT_VERSION 1.10.3
 RUN curl -sL "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | gunzip | tar -x -C /usr/local
diff --git a/community-build/community-projects/scala-collection-compat b/community-build/community-projects/scala-collection-compat
diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -140,7 +140,7 @@ final case class SbtCommunityProject(
       case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
       case _ => Nil
     extraSbtArgs ++ sbtProps ++ List(
-      "-sbt-version", "1.10.2",
+      "-sbt-version", "1.10.3",
       "-Dsbt.supershell=false",
       s"-Ddotty.communitybuild.dir=$communitybuildDir",
       s"--addPluginSbtFile=$sbtPluginFilePath"

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -28,5 +28,5 @@ object Dependencies {
     "com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
   )
 
-  val compilerInterface = "org.scala-sbt" % "compiler-interface" % "1.10.2"
+  val compilerInterface = "org.scala-sbt" % "compiler-interface" % "1.10.3"
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.3
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.3
diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.3
+2 −0		.git-blame-ignore-revs
+22 −22		.github/workflows/ci.yml
+1 −0		.jvmopts
+2 −0		.mailmap
+12 −0		.scala-steward.conf
+11 −6		.scalafmt.conf
+2 −2		NOTICE
+36 −19		README.md
+2 −2		admin/scalafmt.sh
+1 −1		binary-compat/test/src/test/scala/BinaryCompaTest.scala
+68 −43		build.sbt
+65 −0		compat/jsNative/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
+121 −0		compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
+74 −0		compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala
+4 −4		compat/src/main/scala-2.11/scala/collection/compat/package.scala
+65 −0		compat/src/main/scala-2.11/scala/jdk/javaapi/CollectionConverters.scala
+409 −0		compat/src/main/scala-2.11/scala/util/Using.scala
+1 −1		compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala
+4 −4		compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
+160 −14		compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
+36 −0		compat/src/main/scala-2.11_2.12/scala/collection/compat/RandomExtensions.scala
+320 −0		compat/src/main/scala-2.11_2.12/scala/collection/compat/StringParsers.scala
+59 −55		compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
+71 −57		compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala
+3 −2		compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala
+30 −0		compat/src/main/scala-2.11_2.12/scala/util/matching/compat/package.scala
+5 −5		compat/src/main/scala-2.12/scala/collection/compat/package.scala
+65 −0		compat/src/main/scala-2.12/scala/jdk/javaapi/CollectionConverters.scala
+6 −6		compat/src/main/scala-2.12/scala/util/Using.scala
+18 −0		compat/src/main/scala-2.13/scala/util/matching/compat/package.scala
+55 −0		compat/src/test/scala-js/test/scala/jdk/OptionConvertersTest.scala
+89 −5		compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala
+37 −0		compat/src/test/scala-jvm/test/scala/collection/StringParsersJVMTest.scala
+97 −0		compat/src/test/scala-jvm/test/scala/jdk/OptionConvertersJVMTest.scala
+128 −0		compat/src/test/scala-jvm/test/scala/jdk/javaapi/CollectionConvertersTest.java
+24 −0		compat/src/test/scala-jvm/test/scala/jdk/javaapi/TestObjects.scala
+20 −20		compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala
+165 −135		compat/src/test/scala/scala/util/UsingTest.scala
+26 −0		compat/src/test/scala/scala/util/matching/compat/RegexOpsTest.scala
+7 −0		compat/src/test/scala/test/scala/collection/ArraySeqTest.scala
+49 −0		compat/src/test/scala/test/scala/collection/AssertThrown.scala
+34 −34		compat/src/test/scala/test/scala/collection/BuildFromTest.scala
+60 −16		compat/src/test/scala/test/scala/collection/CollectionTest.scala
+6 −3		compat/src/test/scala/test/scala/collection/FactoryTest.scala
+63 −52		compat/src/test/scala/test/scala/collection/LazyListLazinessTest.scala
+14 −12		compat/src/test/scala/test/scala/collection/LazyListTest.scala
+5 −5		compat/src/test/scala/test/scala/collection/LazyZipTest.scala
+5 −5		compat/src/test/scala/test/scala/collection/MapTest.scala
+10 −38		compat/src/test/scala/test/scala/collection/MinMaxOptionTest.scala
+48 −0		compat/src/test/scala/test/scala/collection/OptionTest.scala
+3 −3		compat/src/test/scala/test/scala/collection/QueueTest.scala
+45 −1		compat/src/test/scala/test/scala/collection/SortedTest.scala
+305 −0		compat/src/test/scala/test/scala/collection/StringParsersTest.scala
+2 −2		compat/src/test/scala/test/scala/collection/ViewTest.scala
+34 −0		compat/src/test/scala/test/scala/util/RandomTest.scala
+12 −8		project/MultiScalaProject.scala
+13 −18		project/Version.scala
+1 −1		project/build.properties
+7 −7		project/plugins.sbt
+11 −11		scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala
+52 −41		scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala
+24 −24		scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala
+3 −2		scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala
+24 −22		scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala
+3 −3		scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala
+3 −3		scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala
+44 −41		scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala
+23 −23		scalafix/rules/src/main/scala/scala/fix/collection/package.scala
+1 −1		scalafix/tests/src/test/scala/fix/ScalafixTests.scala