Skip to content

Commit

Permalink
Merge pull request #66 from davenverse/pr/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
armanbilge authored Oct 18, 2023
2 parents a3cd46c + 3806242 commit 6a38583
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.11, 3.2.2]
scala: [2.13.12, 3.3.1]
java: [temurin@8]
project: [rootJS, rootJVM, rootNative]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -146,62 +146,62 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.11, rootJS)
- name: Download target directories (2.13.12, rootJS)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJS

- name: Inflate target directories (2.13.11, rootJS)
- name: Inflate target directories (2.13.12, rootJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.11, rootJVM)
- name: Download target directories (2.13.12, rootJVM)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJVM

- name: Inflate target directories (2.13.11, rootJVM)
- name: Inflate target directories (2.13.12, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.13.11, rootNative)
- name: Download target directories (2.13.12, rootNative)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootNative

- name: Inflate target directories (2.13.11, rootNative)
- name: Inflate target directories (2.13.12, rootNative)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.2.2, rootJS)
- name: Download target directories (3.3.1, rootJS)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootJS

- name: Inflate target directories (3.2.2, rootJS)
- name: Inflate target directories (3.3.1, rootJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.2.2, rootJVM)
- name: Download target directories (3.3.1, rootJVM)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootJVM

- name: Inflate target directories (3.2.2, rootJVM)
- name: Inflate target directories (3.3.1, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.2.2, rootNative)
- name: Download target directories (3.3.1, rootNative)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootNative

- name: Inflate target directories (3.2.2, rootNative)
- name: Inflate target directories (3.3.1, rootNative)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ ThisBuild / tlSonatypeUseLegacyHost := true
ThisBuild / tlMimaPreviousVersions := Set()

val Scala212 = "2.12.18"
val Scala213 = "2.13.11"
val Scala213 = "2.13.12"

ThisBuild / crossScalaVersions := Seq(Scala213, "3.2.2")
ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.1")
ThisBuild / scalaVersion := Scala213

val catsV = "2.9.0"
val catsEffectV = "3.5.0"
val fs2V = "3.7.0"
val http4sV = "0.23.19"
val catsEffectV = "3.5.2"
val fs2V = "3.9.2"
val http4sV = "0.23.23"
val munitCatsEffectV = "2.0.0-M3"
import scalapb.compiler.Version.scalapbVersion

Expand Down
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.22")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.22")
addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.4.22")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6") // Because sbt-protoc-gen-project brings in 1.0.4
addSbtPlugin("com.thesamet" % "sbt-protoc-gen-project" % "0.1.8")
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.13"
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.14"

0 comments on commit 6a38583

Please sign in to comment.