Skip to content

Commit

Permalink
Merge pull request #639 from rochala/bump-scala-3.4.0-RC4-backport
Browse files Browse the repository at this point in the history
Backport 3.4.0-RC4 and CI fix
  • Loading branch information
rochala authored Feb 2, 2024
2 parents 2cdc96a + bc5a824 commit 31abd9e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/release-expression-compiler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ jobs:
jvm: 'adopt:1.8.0-292'
- name: setup GPG secret key
run: echo ${{ secrets.PGP_SECRET }} | base64 --decode | gpg --batch --import
- run: sbt 'expressionCompiler3/publishSigned;sonatypeBundleRelease'
if: startsWith(inputs.scala-version, '3') && !startsWith(inputs.scala-version, '3.0')
- run: sbt 'expressionCompiler3_3/publishSigned;sonatypeBundleRelease'
if: startsWith(inputs.scala-version, '3.1') || startsWith(inputs.scala-version, '3.2') || startsWith(inputs.scala-version, '3.3')
- run: sbt 'expressionCompiler3_4/publishSigned;sonatypeBundleRelease'
if: startsWith(inputs.scala-version, '3.4')
- run: sbt 'expressionCompiler3_0/publishSigned;sonatypeBundleRelease'
if: startsWith(inputs.scala-version, '3.0')
- run: sbt 'expressionCompiler2_13/publishSigned;sonatypeBundleRelease'
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ lazy val expressionCompiler = projectMatrix
case (2, 13) => Seq("2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5", "2.13.4", "2.13.3")
case (3, 0) => Seq("3.0.2", "3.0.1", "3.0.0")
case (3, 1 | 2 | 3) => Seq("3.3.1", "3.3.0", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0")
case (3, _) => Seq("3.4.0-RC2")
case (3, _) => Seq("3.4.0-RC4")
}
.toSeq
.flatten,
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Dependencies {
val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.11")
val scala30 = scalaEnvVersion.filter(isScala30).getOrElse("3.0.2")
val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.1")
val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0-RC2")
val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0-RC4")
val asmVersion = "9.5"
val coursierVersion = "2.1.5"

Expand Down

0 comments on commit 31abd9e

Please sign in to comment.