From b8edbe37de11756a862bd86998837e00cc90648d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 1 Dec 2021 12:55:29 +0100 Subject: [PATCH 01/27] Update mergify-writer to 0.2.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 741a88f..6976d27 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") -libraryDependencies += "io.github.nafg.mergify" %% "mergify-writer" % "0.2.1" +libraryDependencies += "io.github.nafg.mergify" %% "mergify-writer" % "0.2.2" From cabe723bc820b42b2ec00b403df19f2899058e4e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 2 Dec 2021 18:33:39 +0100 Subject: [PATCH 02/27] Update scalatags to 0.11.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index eaead3f..fdbeb56 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,7 @@ def scalaJsReactSettings(config: CssDslConfig) = Seq( ) def scalatagsSettings(config: CssDslConfig) = Seq( - libraryDependencies += "com.lihaoyi" %%% "scalatags" % "0.10.0", + libraryDependencies += "com.lihaoyi" %%% "scalatags" % "0.11.0", cssVariant := TargetImpl.Scalatags, cssDslConfig := config ) From ba8d4a848226ed7f2d9d2f1c26e60da0121f3f24 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 9 Dec 2021 02:35:28 +0100 Subject: [PATCH 03/27] Update scalameta to 4.4.31 --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index d658f31..bb6dfe5 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.30" +libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.31" libraryDependencies += "com.helger" % "ph-css" % "6.4.0" From eb53e850d9423b1edeb42794139c2c16d8ec45ec Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 11 Dec 2021 11:11:06 +0100 Subject: [PATCH 04/27] Update sbt-scalajs, scalajs-compiler, ... to 1.8.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 6976d27..866b1b2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") From 1eca5aa77554b70faa8d794e0733e5157374eaba Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 11 Dec 2021 11:11:10 +0100 Subject: [PATCH 05/27] Update sbt to 1.5.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 7a7e80d..da9d652 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.5 +sbt.version = 1.5.6 From 54296b98b6a62a74e5d02f7098b22c293b081a34 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 16 Dec 2021 02:38:24 +0100 Subject: [PATCH 06/27] Update sbt to 1.5.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index da9d652..8378cad 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.6 +sbt.version = 1.5.7 From 82c6468a72dfedbda24e752da67f7bea906d532c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Dec 2021 08:35:07 +0100 Subject: [PATCH 07/27] Update mergify-writer to 0.3.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 866b1b2..cfe7e2f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") -libraryDependencies += "io.github.nafg.mergify" %% "mergify-writer" % "0.2.2" +libraryDependencies += "io.github.nafg.mergify" %% "mergify-writer" % "0.3.0" From d8e4f14bb8fd9480dcb93f0ca5bfaf207184a2bd Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim Date: Sun, 19 Dec 2021 14:45:37 -0500 Subject: [PATCH 08/27] Use sbt-mergify-github-actions --- .github/workflows/ci.yml | 20 ++++++++++++-------- .mergify.yml | 4 ++-- project/WriteMergify.scala | 28 ---------------------------- project/plugins.sbt | 3 +-- 4 files changed, 15 insertions(+), 40 deletions(-) delete mode 100644 project/WriteMergify.scala diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f87f81..cd51e83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.15, 2.13.7] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -32,10 +32,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 @@ -72,7 +74,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.7] - java: [adopt@1.8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -80,10 +82,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 11 - name: Cache sbt uses: actions/cache@v2 diff --git a/.mergify.yml b/.mergify.yml index f803468..8602e29 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,8 +3,8 @@ pull_request_rules: - name: Automatically merge successful scala-steward PRs conditions: - author=scala-steward - - check-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.8) - - check-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.8) + - check-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11) actions: merge: strict: true diff --git a/project/WriteMergify.scala b/project/WriteMergify.scala deleted file mode 100644 index f99df17..0000000 --- a/project/WriteMergify.scala +++ /dev/null @@ -1,28 +0,0 @@ -import io.github.nafg.mergify.dsl._ -import sbt._ -import sbtghactions.GenerativePlugin -import sbtghactions.GenerativePlugin.autoImport._ - - -object WriteMergify extends AutoPlugin { - override def requires = GenerativePlugin - - override def trigger = allRequirements - - override def projectSettings = Seq( - githubWorkflowGenerate := { - githubWorkflowGenerate.value - for (job <- githubWorkflowGeneratedCI.value if job.id == "build") - IO.write( - file(".mergify.yml"), - mergify - .withRule("Automatically merge successful scala-steward PRs")( - (Attr.Author :== "scala-steward") +: - (for (o <- job.oses; s <- job.scalas; v <- job.javas) yield - Attr.CheckSuccess :== s"${job.name} ($o, $s, $v)"): _* - )(Action.Merge(strict = true)) - .toYaml - ) - } - ) -} diff --git a/project/plugins.sbt b/project/plugins.sbt index cfe7e2f..80f6ccd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") -libraryDependencies += "io.github.nafg.mergify" %% "mergify-writer" % "0.3.0" +addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.3.0") From 5dd67e0ec5ee2ab82cf50f492c7c8d49da5a2888 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 20 Dec 2021 08:34:32 +0100 Subject: [PATCH 09/27] Update sbt-mergify-github-actions to 0.4.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 80f6ccd..cb5eb9a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") -addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.3.0") +addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.4.0") From 61cb13188d1fa38ed23f5d06a20b5a302f042d34 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 20 Dec 2021 08:35:32 +0100 Subject: [PATCH 10/27] Regenerate workflow with sbt-github-actions --- .mergify.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 8602e29..d380ab6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,4 +1,7 @@ defaults: {} +queue_rules: + - name: default + conditions: [] pull_request_rules: - name: Automatically merge successful scala-steward PRs conditions: @@ -6,5 +9,5 @@ pull_request_rules: - check-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11) - check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11) actions: - merge: - strict: true + queue: + name: default From 2ad6aa62bc603fe64b5511b5560af4ce1057b91f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 21 Dec 2021 17:33:59 +0100 Subject: [PATCH 11/27] Update sbt to 1.5.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 8378cad..f4f743c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.7 +sbt.version = 1.5.8 From b1c7703b2570f3c2eb8ad9649894d2a93120cb70 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 27 Dec 2021 02:33:24 +0100 Subject: [PATCH 12/27] Update sbt to 1.6.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f4f743c..5c9c9e3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.8 +sbt.version = 1.6.0 From 002c6ab4ec70f940a961091ff5b63fe288a979a4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 29 Dec 2021 20:35:29 +0100 Subject: [PATCH 13/27] Update sbt to 1.6.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 5c9c9e3..dd4ff43 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.6.0 +sbt.version = 1.6.1 From 8a996b04663b96a9ac72e56c50b191c1dda263fa Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 11 Jan 2022 02:40:22 +0100 Subject: [PATCH 14/27] Update ph-css to 6.4.1 --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index bb6dfe5..ef90f70 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,2 +1,2 @@ libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.31" -libraryDependencies += "com.helger" % "ph-css" % "6.4.0" +libraryDependencies += "com.helger" % "ph-css" % "6.4.1" From 77967c60a378a46be99250bbe0a8ebb5be6deb04 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Tue, 11 Jan 2022 02:36:09 -0500 Subject: [PATCH 15/27] scalajs-react 2.0.0. Add Scala 3 and drop 2.12 --- build.sbt | 21 +++++++++++++++------ project/plugins.sbt | 1 + 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index fdbeb56..0b5948a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,21 @@ import scala.sys.process.stringToProcess +import _root_.io.github.nafg.scalacoptions._ -ThisBuild / organization := "io.github.nafg.css-dsl" -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7") -ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last -ThisBuild / scalacOptions += "-feature" -ThisBuild / scalacOptions += "-deprecation" +def myScalacOptions(version: String) = + ScalacOptions.all(version)( + (opts: options.Common) => opts.feature ++ opts.deprecation, + ) + +inThisBuild( + List( + organization := "io.github.nafg.css-dsl", + scalaVersion := "3.0.2", + crossScalaVersions := Seq("2.13.7", scalaVersion.value), + scalacOptions ++= myScalacOptions(scalaVersion.value) + ) +) name := "css-dsl" publish / skip := true @@ -22,7 +31,7 @@ def latestIn(pkg: String, versionMajor: Int) = npmView(s"$pkg@$versionMajor", "version")(_.last match { case npmViewVersionRegex(v) => v }) def scalaJsReactSettings(config: CssDslConfig) = Seq( - libraryDependencies += "com.github.japgolly.scalajs-react" %%% "core" % "1.7.7", + libraryDependencies += "com.github.japgolly.scalajs-react" %%% "core" % "2.0.0", cssVariant := TargetImpl.ScalaJsReact, cssDslConfig := config ) diff --git a/project/plugins.sbt b/project/plugins.sbt index cb5eb9a..21e68fd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,3 +2,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("io.github.nafg.mergify" % "sbt-mergify-github-actions" % "0.4.0") +libraryDependencies += "io.github.nafg.scalac-options" %% "scalac-options" % "0.1.9" From 04c41dd48dd05025ca3b63fec34c5d3d3fa0ad49 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Tue, 11 Jan 2022 02:39:02 -0500 Subject: [PATCH 16/27] build.sbt: set versionScheme to early-semver --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0b5948a..ec7e18e 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,8 @@ inThisBuild( organization := "io.github.nafg.css-dsl", scalaVersion := "3.0.2", crossScalaVersions := Seq("2.13.7", scalaVersion.value), - scalacOptions ++= myScalacOptions(scalaVersion.value) + scalacOptions ++= myScalacOptions(scalaVersion.value), + versionScheme := Some("early-semver") ) ) From 81d44885ded9b3686999ac9ab0c2bdd6a34cdec6 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Tue, 11 Jan 2022 02:39:25 -0500 Subject: [PATCH 17/27] .gitignore: add a few metals-related things --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 92322c4..face47b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .idea/ target/ +/.bsp/ +/.metals/ +/.bloop/ From eead548dcc7418e7c3df2670faf835c8deb79005 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Tue, 11 Jan 2022 02:48:56 -0500 Subject: [PATCH 18/27] Add Bootstrap 5 --- build.sbt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build.sbt b/build.sbt index ec7e18e..e3e74d1 100644 --- a/build.sbt +++ b/build.sbt @@ -59,6 +59,14 @@ val bootstrap4Config = "https://cdn.jsdelivr.net/npm/bootstrap@" + _ + "/dist/css/bootstrap.min.css" ) +val bootstrap5Config = + CssDslConfig( + "Bootstrap 5", + Set(None, Some("bs"), Some("bs5")), + latestIn("bootstrap", 5), + "https://cdn.jsdelivr.net/npm/bootstrap@" + _ + "/dist/css/bootstrap.min.css" + ) + val bulmaConfig = CssDslConfig( "Bulma", @@ -101,6 +109,11 @@ lazy val bootstrap4_scalajsreact = lazy val bootstrap4_scalatags = project.enablePlugins(GeneratorPlugin).settings(scalatagsSettings(bootstrap4Config)) +lazy val bootstrap5_scalajsreact = + project.enablePlugins(ScalaJSPlugin, GeneratorPlugin).settings(scalaJsReactSettings(bootstrap5Config)) +lazy val bootstrap5_scalatags = + project.enablePlugins(GeneratorPlugin).settings(scalatagsSettings(bootstrap5Config)) + lazy val bulma_scalajsreact = project.enablePlugins(ScalaJSPlugin, GeneratorPlugin).settings(scalaJsReactSettings(bulmaConfig)) lazy val bulma_scalatags = From 506412298034de0d4ef2af99f819393c7eed1402 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Tue, 11 Jan 2022 02:51:30 -0500 Subject: [PATCH 19/27] Update README.md --- README.md | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index df98dae..58f0b40 100644 --- a/README.md +++ b/README.md @@ -54,18 +54,20 @@ Artifacts are published to Bintray and synced to Bintray JCenter. For SBT use `r | CSS library | Scala DOM library | SBT Module ID | |--------------|--------------------------|---------------------------------------------------------------------| -| Bootstrap 3 | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "bootstrap3_scalatags" % "0.7.1"` | -| Bootstrap 3 | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "bootstrap3_scalajsreact" % "0.7.1"` | -| Bootstrap 4 | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "bootstrap4_scalatags" % "0.7.1"` | -| Bootstrap 4 | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "bootstrap4_scalajsreact" % "0.7.1"` | -| Bulma | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "bulma_scalatags" % "0.7.1"` | -| Bulma | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "bulma_scalajsreact" % "0.7.1"` | -| Fomantic UI | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "fomanticui_scalatags" % "0.7.1"` | -| Fomantic UI | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "fomanticui_scalajsreact" % "0.7.1"` | -| Font Awesome | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "fontawesome_scalatags" % "0.7.1"` | -| Font Awesome | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "fontawesome_scalajsreact" % "0.7.1"` | -| Semantic UI | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "semanticui_scalatags" % "0.7.1"` | -| Semantic UI | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "semanticui_scalajsreact" % "0.7.1"` | +| Bootstrap 3 | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "bootstrap3_scalatags" % "0.9.0"` | +| Bootstrap 3 | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "bootstrap3_scalajsreact" % "0.9.0"` | +| Bootstrap 4 | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "bootstrap4_scalatags" % "0.9.0"` | +| Bootstrap 4 | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "bootstrap4_scalajsreact" % "0.9.0"` | +| Bootstrap 5 | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "bootstrap5_scalatags" % "0.9.0"` | +| Bootstrap 5 | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "bootstrap5_scalajsreact" % "0.9.0"` | +| Bulma | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "bulma_scalatags" % "0.9.0"` | +| Bulma | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "bulma_scalajsreact" % "0.9.0"` | +| Fomantic UI | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "fomanticui_scalatags" % "0.9.0"` | +| Fomantic UI | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "fomanticui_scalajsreact" % "0.9.0"` | +| Font Awesome | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "fontawesome_scalatags" % "0.9.0"` | +| Font Awesome | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "fontawesome_scalajsreact" % "0.9.0"` | +| Semantic UI | `scalatags.Text` (JVM) | `"io.github.nafg.css-dsl" %% "semanticui_scalatags" % "0.9.0"` | +| Semantic UI | scalajs-react (scala.js) | `"io.github.nafg.css-dsl" %%% "semanticui_scalajsreact" % "0.9.0"` | ### Import @@ -78,9 +80,13 @@ Artifacts are published to Bintray and synced to Bintray JCenter. For SBT use `r | Bootstrap 4 | None | `import cssdsl.bootstrap4.Dsl._` | | Bootstrap 4 | `bs` | `import cssdsl.bootstrap4.BsDsl._` | | Bootstrap 4 | `bs4` | `import cssdsl.bootstrap4.Bs4Dsl._` | +| Bootstrap 5 | None | `import cssdsl.bootstrap5.Dsl._` | +| Bootstrap 5 | `bs` | `import cssdsl.bootstrap5.BsDsl._` | +| Bootstrap 5 | `bs5` | `import cssdsl.bootstrap5.Bs5Dsl._` | | Bulma | None | `import cssdsl.bulma.Dsl._` | | Bulma | `b` | `import cssdsl.bulma.BDsl._` | | Fomantic UI | `f` | `import cssdsl.fomanticui.FDsl._` | +| Font Awesome | None | `import cssdsl.fontawesome.Dsl._` | | Font Awesome | `fa` | `import cssdsl.fontawesome.FaDsl._` | | Semantic UI | `s` | `import cssdsl.semanticui.SDsl._` | From 4c04f2a367c6381e8044aa2d8084c9905fb362e7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 11 Jan 2022 10:38:48 +0100 Subject: [PATCH 20/27] Update scala3-library, ... to 3.1.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e3e74d1..2ba9455 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ def myScalacOptions(version: String) = inThisBuild( List( organization := "io.github.nafg.css-dsl", - scalaVersion := "3.0.2", + scalaVersion := "3.1.0", crossScalaVersions := Seq("2.13.7", scalaVersion.value), scalacOptions ++= myScalacOptions(scalaVersion.value), versionScheme := Some("early-semver") From 277990543332b7af808baca98b6b28e4b63f877b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 11 Jan 2022 10:39:26 +0100 Subject: [PATCH 21/27] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 18 +++++++++--------- .mergify.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd51e83..34efc19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.7] + scala: [2.13.7, 3.1.0] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -58,7 +58,7 @@ jobs: run: sbt ++${{ matrix.scala }} test - name: Compress target directories - run: tar cf targets.tar bootstrap3_scalatags/target fomanticui_scalatags/target bootstrap4_scalatags/target bulma_scalatags/target bootstrap3_scalajsreact/target fontawesome_scalatags/target target bulma_scalajsreact/target bootstrap4_scalajsreact/target fontawesome_scalajsreact/target semanticui_scalajsreact/target semanticui_scalatags/target fomanticui_scalajsreact/target project/target + run: tar cf targets.tar bootstrap3_scalatags/target fomanticui_scalatags/target bootstrap4_scalatags/target bulma_scalatags/target bootstrap3_scalajsreact/target fontawesome_scalatags/target bootstrap5_scalajsreact/target target bulma_scalajsreact/target bootstrap4_scalajsreact/target fontawesome_scalajsreact/target semanticui_scalajsreact/target semanticui_scalatags/target fomanticui_scalajsreact/target bootstrap5_scalatags/target project/target - name: Upload target directories uses: actions/upload-artifact@v2 @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [3.1.0] 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.12.15) + - name: Download target directories (2.13.7) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} - - name: Inflate target directories (2.12.15) + - name: Inflate target directories (2.13.7) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.7) + - name: Download target directories (3.1.0) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} + name: target-${{ matrix.os }}-3.1.0-${{ matrix.java }} - - name: Inflate target directories (2.13.7) + - name: Inflate target directories (3.1.0) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index d380ab6..a4845e1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,8 +6,8 @@ pull_request_rules: - name: Automatically merge successful scala-steward PRs conditions: - author=scala-steward - - check-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11) - check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11) + - check-success=Build and Test (ubuntu-latest, 3.1.0, temurin@11) actions: queue: name: default From e3b796ec346a9175b21074d48e67c31e1ea61af5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Jan 2022 11:32:07 +0100 Subject: [PATCH 22/27] Update ph-css to 6.4.3 --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index ef90f70..d86984a 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,2 +1,2 @@ libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.31" -libraryDependencies += "com.helger" % "ph-css" % "6.4.1" +libraryDependencies += "com.helger" % "ph-css" % "6.4.3" From 6e1911ffe265f021422363d6c5f0fe37422c6c27 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Sun, 16 Jan 2022 11:49:09 -0500 Subject: [PATCH 23/27] Run sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 18 +++++++++--------- .mergify.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd51e83..643fa9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.7] + scala: [2.13.7, 3.0.2] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -58,7 +58,7 @@ jobs: run: sbt ++${{ matrix.scala }} test - name: Compress target directories - run: tar cf targets.tar bootstrap3_scalatags/target fomanticui_scalatags/target bootstrap4_scalatags/target bulma_scalatags/target bootstrap3_scalajsreact/target fontawesome_scalatags/target target bulma_scalajsreact/target bootstrap4_scalajsreact/target fontawesome_scalajsreact/target semanticui_scalajsreact/target semanticui_scalatags/target fomanticui_scalajsreact/target project/target + run: tar cf targets.tar bootstrap3_scalatags/target fomanticui_scalatags/target bootstrap4_scalatags/target bulma_scalatags/target bootstrap3_scalajsreact/target fontawesome_scalatags/target bootstrap5_scalajsreact/target target bulma_scalajsreact/target bootstrap4_scalajsreact/target fontawesome_scalajsreact/target semanticui_scalajsreact/target semanticui_scalatags/target fomanticui_scalajsreact/target bootstrap5_scalatags/target project/target - name: Upload target directories uses: actions/upload-artifact@v2 @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [3.0.2] 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.12.15) + - name: Download target directories (2.13.7) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} - - name: Inflate target directories (2.12.15) + - name: Inflate target directories (2.13.7) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.7) + - name: Download target directories (3.0.2) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} + name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }} - - name: Inflate target directories (2.13.7) + - name: Inflate target directories (3.0.2) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index d380ab6..d59f50e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,8 +6,8 @@ pull_request_rules: - name: Automatically merge successful scala-steward PRs conditions: - author=scala-steward - - check-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11) - check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11) + - check-success=Build and Test (ubuntu-latest, 3.0.2, temurin@11) actions: queue: name: default From 717fbbe17c070c384edbd127e27094cc648878c4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jan 2022 18:25:53 +0100 Subject: [PATCH 24/27] Update scala3-library, ... to 3.1.0 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 643fa9c..6fd47c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7, 3.0.2] + scala: [2.13.7, 3.1.0] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.0.2] + scala: [3.1.0] java: [temurin@11] runs-on: ${{ matrix.os }} steps: From ee93df27387618e883485126b548984fd8fa6ce7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jan 2022 18:26:33 +0100 Subject: [PATCH 25/27] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 6 +++--- .mergify.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fd47c7..34efc19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,12 +111,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.2) + - name: Download target directories (3.1.0) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }} + name: target-${{ matrix.os }}-3.1.0-${{ matrix.java }} - - name: Inflate target directories (3.0.2) + - name: Inflate target directories (3.1.0) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index d59f50e..a4845e1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -7,7 +7,7 @@ pull_request_rules: conditions: - author=scala-steward - check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11) - - check-success=Build and Test (ubuntu-latest, 3.0.2, temurin@11) + - check-success=Build and Test (ubuntu-latest, 3.1.0, temurin@11) actions: queue: name: default From cdb82130929170e431fb1183263fa994ec57f8c8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 11 Jan 2022 12:49:08 +0100 Subject: [PATCH 26/27] Update scalameta to 4.4.32 --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index ef90f70..6b150b3 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.31" +libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.32" libraryDependencies += "com.helger" % "ph-css" % "6.4.1" From 39e733352764a95b4555ad0ea7b5e3296dd4a160 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 16 Jan 2022 23:29:02 +0100 Subject: [PATCH 27/27] Update scala-library to 2.13.8 (#163) * Update scala-library to 2.13.8 * Regenerate workflow with sbt-github-actions * Update scala-library to 2.13.8 * Regenerate workflow with sbt-github-actions * Update scala-library to 2.13.8 * Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 8 ++++---- .mergify.yml | 2 +- build.sbt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34efc19..8f43beb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7, 3.1.0] + scala: [2.13.8, 3.1.0] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -101,12 +101,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.7) + - name: Download target directories (2.13.8) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }} - - name: Inflate target directories (2.13.7) + - name: Inflate target directories (2.13.8) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index a4845e1..8f59eed 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,7 +6,7 @@ pull_request_rules: - name: Automatically merge successful scala-steward PRs conditions: - author=scala-steward - - check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.13.8, temurin@11) - check-success=Build and Test (ubuntu-latest, 3.1.0, temurin@11) actions: queue: diff --git a/build.sbt b/build.sbt index 2ba9455..adeeaaa 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ inThisBuild( List( organization := "io.github.nafg.css-dsl", scalaVersion := "3.1.0", - crossScalaVersions := Seq("2.13.7", scalaVersion.value), + crossScalaVersions := Seq("2.13.8", scalaVersion.value), scalacOptions ++= myScalacOptions(scalaVersion.value), versionScheme := Some("early-semver") )