File tree Expand file tree Collapse file tree 4 files changed +7
-6
lines changed
interfaces/compiler/src/main/java/compiler/interfaces
migrate/src/main/scala/migrate/utils Expand file tree Collapse file tree 4 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 27272828 - run : sbt test
2929# - run: sbt compileScalafixOutputinScala3 -- this only test that scalafixOutput compiles in the latest scala 3.
30- # Right now there a missing dependency. Todo: Remove this once dev.zio:zio_3.0.0-RC1 is released
30+ # Right now there a missing dependency. Todo: Remove this once dev.zio:zio_3.0.0-RC2 is released
3131 windows_213 :
3232 name : Windows tests
3333 runs-on : windows-latest
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ lazy val migrate = project
6969 fromScalacOptions(" scala3CompilerOptions" , output / Compile / scalacOptions),
7070 " scala3ClassDirectory" -> (output / Compile / compile / classDirectory).value
7171 ),
72- Compile / buildInfoKeys := Seq (" version" -> version.value)
72+ Compile / buildInfoKeys := Seq (" version" -> version.value, " scala3Version " -> V .scala3 )
7373 )
7474 .enablePlugins(BuildInfoPlugin )
7575 .dependsOn(`compiler-interfaces`)
@@ -208,7 +208,7 @@ lazy val V = new {
208208 val scala213BinaryVersion = " 2.13"
209209 val scala212 = " 2.12.13"
210210 val scalatest = " 3.2.6"
211- val scala3 = " 3.0.0-RC1 "
211+ val scala3 = " 3.0.0-RC2 "
212212 val scalafix = " 0.9.27"
213213 val scribe = " 3.5.1"
214214 val organizeImports = " 0.4.3"
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ public static Scala3Compiler setupCompiler(String[] args) {
1919 }
2020
2121 public Scala3Compiler setup (String [] args ) {
22- Context setup = driver .setup (args , initCtx ())._2 ;
22+ Context setup = driver .setup (args , initCtx ()).get (). _2 ;
2323 return new Scala3Compiler (newCompiler (setup ), setup );
2424 }
2525}
Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ package migrate.utils
33import scala .concurrent .ExecutionContext
44import scala .concurrent .ExecutionContextExecutor
55
6+ import buildinfo .BuildInfo
67import coursier .Repositories
78import migrate .internal .CompatibleWithScala3Lib
89import migrate .internal .Lib213
@@ -12,8 +13,8 @@ import migrate.internal.LibToMigrate.Revision
1213
1314object CoursierHelper {
1415 implicit val ec : ExecutionContextExecutor = ExecutionContext .global
15- val scala3Full = " 3.0.0-RC1 "
16- val scala3Binary = " 3.0.0-RC1 "
16+ val scala3Full = BuildInfo .scala3Version
17+ val scala3Binary = BuildInfo .scala3Version
1718 val scala213Binary = " 2.13"
1819 val scala213Full = " 2.13.5" // should be taken from the project build
1920
You can’t perform that action at this time.
0 commit comments