Skip to content

Commit

Permalink
Merge pull request #288 from scala-steward/update/scalac-options-0.3.0
Browse files Browse the repository at this point in the history
Update scalac-options to 0.3.0
  • Loading branch information
mergify[bot] committed May 26, 2024
2 parents 8863a82 + 595918d commit 8f2a2a7
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
Expand Down Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 8f2a2a7

Please sign in to comment.