diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c0b800..e3362ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,7 @@ jobs: - 2.13.5 - 3.0.0-M3 - 3.0.0-RC1 + - 3.0.0-RC2 java: [graalvm-ce-java11@20.3.0] runs-on: ${{ matrix.os }} steps: @@ -222,6 +223,16 @@ jobs: tar xf targets.tar rm targets.tar + - name: Download target directories (3.0.0-RC2) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }} + + - name: Inflate target directories (3.0.0-RC2) + run: | + tar xf targets.tar + rm targets.tar + - uses: olafurpg/setup-gpg@v3 - run: sbt ++${{ matrix.scala }} ci-release \ No newline at end of file diff --git a/README.md b/README.md index 136f108..6251afa 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ The plugin is currently published for the following Scala versions: - 2.12.10, 2.12.11, 2.12.12, 2.12.13 - 2.13.1, 2.13.2, 2.13.3, 2.13.4, 2.13.5 -- 3.0.0-M3, 3.0.0-RC1 +- 3.0.0-M3, 3.0.0-RC1, 3.0.0-RC2 ## What does the plugin actually do? diff --git a/build.sbt b/build.sbt index e246703..50bc629 100644 --- a/build.sbt +++ b/build.sbt @@ -11,6 +11,12 @@ inThisBuild( "Jakub Kozłowski", "kubukoz@gmail.com", url("https://kubukoz.com") + ), + Developer( + "majk-p", + "Michał Pawlik", + "admin@michalp.net", + url("https://michalp.net") ) ) ) @@ -32,7 +38,8 @@ ThisBuild / crossScalaVersions := Seq( "2.13.5", // "3.0.0-M3", - "3.0.0-RC1" + "3.0.0-RC1", + "3.0.0-RC2" ) ThisBuild / githubWorkflowJavaVersions := Seq(GraalVM11) @@ -60,10 +67,12 @@ val commonSettings = Seq( scalacOptions -= "-Xfatal-warnings" ) -def scalatestVersion(scalaVersion: String) = scalaVersion match { - case "3.0.0-M3" => "3.2.3" - case _ => "3.2.5" -} +def scalatestVersion(scalaVersion: String) = + scalaVersion match { + case "3.0.0-M3" => "3.2.3" + case "3.0.0-RC1" => "3.2.5" + case _ => "3.2.7" + } val plugin = project.settings( name := "better-tostring", @@ -72,7 +81,7 @@ val plugin = project.settings( crossVersion := CrossVersion.full, libraryDependencies ++= Seq( scalaOrganization.value % ( - if (isDotty.value) + if (scalaVersion.value.startsWith("3")) s"scala3-compiler_${scalaVersion.value}" else "scala-compiler" ) % scalaVersion.value