diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 462205c..6b71e1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.12, 3.3.1] + scala: [2.13.14, 3.3.3] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.3.1] + scala: [3.3.3] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -101,22 +101,22 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.12) + - name: Download target directories (2.13.14) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.14-${{ matrix.java }} - - name: Inflate target directories (2.13.12) + - name: Inflate target directories (2.13.14) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.1) + - name: Download target directories (3.3.3) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }} + name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }} - - name: Inflate target directories (3.3.1) + - name: Inflate target directories (3.3.3) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index 464e675..3050714 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,8 +8,8 @@ pull_request_rules: - or: - author=scala-steward - author=nafg-scala-steward[bot] - - check-success=Build and Test (ubuntu-latest, 2.13.12, temurin@11) - - check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.13.14, temurin@11) + - check-success=Build and Test (ubuntu-latest, 3.3.3, temurin@11) actions: queue: name: default diff --git a/build.sbt b/build.sbt index e190316..16f37a2 100644 --- a/build.sbt +++ b/build.sbt @@ -11,8 +11,8 @@ def myScalacOptions(version: String) = inThisBuild( List( organization := "io.github.nafg.css-dsl", - scalaVersion := "3.3.1", - crossScalaVersions := Seq("2.13.12", scalaVersion.value), + scalaVersion := "3.3.3", + crossScalaVersions := Seq("2.13.14", scalaVersion.value), scalacOptions ++= myScalacOptions(scalaVersion.value), versionScheme := Some("early-semver") ) @@ -43,7 +43,7 @@ def scalaJsReactSettings(config: CssDslConfig) = Seq( ) def scalatagsSettings(config: CssDslConfig) = Seq( - libraryDependencies += "com.lihaoyi" %%% "scalatags" % "0.12.0", + libraryDependencies += "com.lihaoyi" %%% "scalatags" % "0.13.1", cssVariant := TargetImpl.Scalatags, cssDslConfig := config ) diff --git a/project/build.sbt b/project/build.sbt index 10736bf..ae6e4b3 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "org.scalameta" %% "scalameta" % "4.9.2" +libraryDependencies += "org.scalameta" %% "scalameta" % "4.9.5" libraryDependencies += "com.helger" % "ph-css" % "7.0.1" diff --git a/project/plugins.sbt b/project/plugins.sbt index f0c8317..117d6b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.7.0") -libraryDependencies += "io.github.nafg.scalac-options" %% "scalac-options" % "0.2.0" +libraryDependencies += "io.github.nafg.scalac-options" %% "scalac-options" % "0.3.0"