Skip to content

Commit

Permalink
Update Scala3 version to 3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
guizmaii committed Jun 3, 2023
1 parent dd0fb6f commit 75238fa
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 22 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
scala: [2.12.x, 2.13.x, 3.2.x]
scala: [2.12.x, 2.13.x, 3.3.x]
module: [base, db, js, async, codegen, bigdata]
include:
- scala: 2.12.x
Expand All @@ -33,20 +33,20 @@ jobs:
- scala: 2.13.x
scala_short: 213
scala_short_dot: 2.13
- scala: 3.2.x
scala_short: 32
scala_short_dot: 3.2
- scala: 3.3.x
scala_short: 33
scala_short_dot: 3.3
exclude:
# For now, only do the `base` build for Scala 3
- scala: 3.2.x
- scala: 3.3.x
module: db
- scala: 3.2.x
- scala: 3.3.x
module: js
- scala: 3.2.x
- scala: 3.3.x
module: async
- scala: 3.2.x
- scala: 3.3.x
module: codegen
- scala: 3.2.x
- scala: 3.3.x
module: bigdata
# For other modules, `base` build is already included
- scala: 2.12.x
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
strategy:
fail-fast: false
matrix:
scala: [2.12.x, 2.13.x, 3.2.x]
scala: [2.12.x, 2.13.x, 3.3.x]
module: [docs, base, db, js, async, codegen, bigdata]
include:
- scala: 2.12.x
Expand All @@ -97,19 +97,19 @@ jobs:
- scala: 2.13.x
scala_short: 213
scala_short_dot: 2.13
- scala: 3.2.x
scala_short: 32
scala_short_dot: 3.2
- scala: 3.3.x
scala_short: 33
scala_short_dot: 3.3
exclude:
- scala: 3.2.x
- scala: 3.3.x
module: db
- scala: 3.2.x
- scala: 3.3.x
module: js
- scala: 3.2.x
- scala: 3.3.x
module: async
- scala: 3.2.x
- scala: 3.3.x
module: codegen
- scala: 3.2.x
- scala: 3.3.x
module: bigdata

name: Release ${{matrix.scala_short_dot}} - ${{matrix.module}}
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ def excludePaths(paths: Seq[String]) = {

val scala_v_12 = "2.12.17"
val scala_v_13 = "2.13.10"
val scala_v_30 = "3.2.2"
val scala_v_30 = "3.3.0"

lazy val loggingSettings = Seq(
libraryDependencies ++= Seq(
Expand Down
6 changes: 3 additions & 3 deletions build/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ fi

SBT_2_12="sbt ++2.12.17 -Dquill.macro.log=false -Dquill.scala.version=2.12.17"
SBT_2_13="sbt ++2.13.10 -Dquill.macro.log=false -Dquill.scala.version=2.13.10"
SBT_3_2="sbt ++3.2.2 -Dquill.macro.log=false -Dquill.scala.version=3.2.2"
SBT_3_3="sbt ++3.3.0 -Dquill.macro.log=false -Dquill.scala.version=3.3.0"

if [[ $VERSION -eq 212 ]]
then
SBT_VER=$SBT_2_12
elif [[ $VERSION -eq 213 ]]
then
SBT_VER=$SBT_2_13
elif [[ $VERSION -eq 32 ]]
elif [[ $VERSION -eq 33 ]]
then
SBT_VER=$SBT_3_2
SBT_VER=$SBT_3_3
else
echo "No Valid SBT Version Entered"
exit 1
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ title: "Quill Changelog"
# 4.7.0

- [Update Scala 2.12 && Drop `quill-finagle-mysql` and `quill-finagle-postgres` modules](https://github.com/zio/zio-quill/pull/2756)
- [Update Scala3 version to `3.3.0`]()

# 4.6.1

Expand Down

0 comments on commit 75238fa

Please sign in to comment.