From 4c04f2a367c6381e8044aa2d8084c9905fb362e7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 11 Jan 2022 10:38:48 +0100 Subject: [PATCH 1/6] 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 2/6] 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 717fbbe17c070c384edbd127e27094cc648878c4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jan 2022 18:25:53 +0100 Subject: [PATCH 3/6] 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 4/6] 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 5/6] 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 6/6] 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") )