Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Scala, sbt, libs and CI #163

Closed
wants to merge 2 commits into from
Closed

Update Scala, sbt, libs and CI #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7be189f
Update sbt
guizmaii Oct 24, 2023
41657b0
Update Scala, libs and CI
guizmaii Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ jobs:
uses: actions/[email protected]
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v14
- name: Setup Scala
uses: actions/[email protected]
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Scala dependencies
uses: coursier/cache-action@v6
- name: Lint code
Expand All @@ -34,8 +38,12 @@ jobs:
steps:
- name: Checkout current branch
uses: actions/[email protected]
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v14
- name: Setup Scala
uses: actions/[email protected]
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Check Document Generation
Expand All @@ -47,18 +55,20 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['[email protected]', '[email protected]']
scala: ['2.12.17', '2.13.10', '3.2.1']
java: ['11', '17', '21']
scala: ['2.12.18', '2.13.12', '3.3.1']
platform: ['JVM']
steps:
- name: Checkout current branch
uses: actions/[email protected]
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v14
- name: Setup Scala
uses: actions/setup-[email protected]
with:
distribution: corretto
java-version: ${{ matrix.java }}
check-latest: true
- name: Cache Scala dependencies
uses: coursier/cache-action@v6
- name: Run tests
Expand All @@ -83,8 +93,12 @@ jobs:
uses: actions/[email protected]
with:
fetch-depth: 0
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v14
- name: Setup Scala
uses: actions/[email protected]
with:
distribution: corretto
java-version: '17'
check-latest: true
- name: Cache Scala dependencies
uses: coursier/cache-action@v6
- name: Release artifacts
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import BuildHelper._

val ZioVersion = "2.0.6"
val ZioVersion = "2.0.18"
val H2Version = "2.1.214"
val ZioSchemaVersion = "0.4.8"
val ZioSchemaVersion = "0.4.14"

name := "zio-jdbc"

Expand Down Expand Up @@ -73,7 +73,7 @@ lazy val examples = project
.settings(
publish / skip := true,
libraryDependencies ++= Seq(
"ch.qos.logback" % "logback-classic" % "1.4.6",
"ch.qos.logback" % "logback-classic" % "1.4.7",
"net.logstash.logback" % "logstash-logback-encoder" % "7.3"
)
)
Expand Down
2 changes: 1 addition & 1 deletion project/BuildHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ object BuildHelper {

lazy val Scala212: String = versions("2.12")
lazy val Scala213: String = versions("2.13")
lazy val Scala3: String = versions("3.2")
lazy val Scala3: String = versions("3.3")

val SilencerVersion = "1.7.12"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.8.2
sbt.version = 1.9.7
Loading