Merge pull request #748 from eikek/sbt-ci

Sbt ci

.github/renovate.json

@@ -0,0 +1,12 @@
+{
+  "automerge": true,
+  "labels": ["type: dependencies"],
+  "packageRules": [
+    {
+      "matchManagers": [
+        "sbt"
+      ],
+      "enabled": false
+    }
+  ]
+}

.github/workflows/auto-approve.yml

@@ -0,0 +1,13 @@
+name: Auto approve
+
+on:
+  pull_request_target
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: hmarr/auto-approve-action@v2.1.0
+        if: github.actor == 'scala-steward'
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+name: CI
+on:
+  pull_request:
+jobs:
+  ci-matrix:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 'openjdk@1.11' ]
+    steps:
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 100
+      - uses: jorelali/setup-elm@v3
+        with:
+          elm-version: 0.19.1
+      - uses: bahmutov/npm-install@v1
+      - name: Fetch tags
+        run: git fetch --depth=100 origin +refs/tags/*:refs/tags/*
+      - uses: olafurpg/setup-scala@v10
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Coursier cache
+        uses: coursier/cache-action@v6
+      - name: sbt ci ${{ github.ref }}
+        run: sbt ci
+  ci:
+    runs-on: ubuntu-20.04
+    needs: [ci-matrix]
+    steps:
+      - name: Aggregate of lint, and all tests
+        run: echo "ci passed"

.travis.yml

@@ -1,35 +0,0 @@
-language: scala
-scala:
-  - 2.13.5
-
-jdk:
-  - openjdk11
-
-cache:
-  directories:
-    - $HOME/.ivy2/cache
-    - $HOME/.sbt/boot
-    - $HOME/.coursier/cache
-    - $HOME/.cache/coursier
-    - sysconfcpus
-
-install:
-  - TRAVIS_NODE_VERSION="10" nvm install node
-  - nvm use node
-  - node --version
-  - npm --version
-  - npm install -g elm
-  - |
-    # update this only when sbt-the-bash-script needs to be updated
-    export SBT_LAUNCHER=1.4.8
-    export SBT_OPTS="-Dfile.encoding=UTF-8"
-    curl -L --silent "https://github.com/sbt/sbt/releases/download/v$SBT_LAUNCHER/sbt-$SBT_LAUNCHER.tgz" > $HOME/sbt.tgz
-    tar zxf $HOME/sbt.tgz -C $HOME
-    sudo rm /usr/local/bin/sbt
-    sudo ln -s $HOME/sbt/bin/sbt /usr/local/bin/sbt
-
-before_script:
-  - export TZ=Europe/Berlin
-
-script:
-  - sbt -J-XX:+UseG1GC ++$TRAVIS_SCALA_VERSION ";project root ;scalafmtCheckAll ;make ;test"

build.sbt

@@ -39,9 +39,9 @@ val sharedSettings = Seq(
     val dir    = (LocalRootProject / baseDirectory).value / "tools"
     packageTools(logger, dir, v)
   },
-  scalacOptions in (Compile, console) :=
+  Compile / console / scalacOptions :=
     (scalacOptions.value.filter(o => !o.contains("-Xlint") && !o.contains("-W"))),
-  scalacOptions in (Test, console) :=
+  Test / console / scalacOptions :=
     (scalacOptions.value.filter(o => !o.contains("-Xlint") && !o.contains("-W")))
 ) ++ scalafixSettings
 
@@ -83,7 +83,7 @@ val stylesSettings = Seq(
 def webjarSettings(queryJS: Project) = Seq(
   Compile / resourceGenerators += Def.task {
     copyWebjarResources(
-      Seq((sourceDirectory in Compile).value / "webjar"),
+      Seq((Compile / sourceDirectory).value / "webjar"),
       (Compile / resourceManaged).value,
       name.value,
       version.value,
@@ -112,7 +112,7 @@ def webjarSettings(queryJS: Project) = Seq(
 def debianSettings(cfgFile: String) =
   Seq(
     maintainer := "Eike Kettner <eike.kettner@posteo.de>",
-    mappings in Universal += {
+    Universal / mappings += {
       val conf = (Compile / resourceDirectory).value / "reference.conf"
       if (!conf.exists)
         sys.error(s"File $conf not found")
@@ -570,11 +570,11 @@ val website = project
   .settings(
     name := "docspell-website",
     publishArtifact := false,
-    skip in publish := true,
+    publish / skip := true,
     ghpagesNoJekyll := true,
     // the ghpages plugins works together with the site plugin (its a dependency)
     // to make it publish the zola generated site, override their mappings with the zola output
-    mappings in SitePlugin.autoImport.makeSite :=
+    SitePlugin.autoImport.makeSite / mappings :=
       Path.selectSubpaths(zolaOutputDir.value, _ => true).toSeq,
     git.remoteRepo := "git@github.com:eikek/docspell",
     Compile / resourceGenerators += Def.task {
@@ -584,10 +584,10 @@ val website = project
       val logger = streams.value.log
 
       val files = Seq(
-        (resourceDirectory in (restserver, Compile)).value / "reference.conf"     -> templateOut / "server.conf",
+        (restserver / Compile / resourceDirectory).value / "reference.conf"       -> templateOut / "server.conf",
-        (resourceDirectory in (joex, Compile)).value / "reference.conf"           -> templateOut / "joex.conf",
+        (joex / Compile / resourceDirectory).value / "reference.conf"             -> templateOut / "joex.conf",
         (LocalRootProject / baseDirectory).value / "tools" / "exim" / "exim.conf" -> templateOut / "sample-exim.conf",
-        (resourceDirectory in (restapi, Compile)).value / "docspell-openapi.yml"  -> staticOut / "docspell-openapi.yml",
+        (restapi / Compile / resourceDirectory).value / "docspell-openapi.yml"    -> staticOut / "docspell-openapi.yml",
         (restapi / Compile / openapiStaticDoc).value                              -> staticOut / "docspell-openapi.html"
       )
       IO.copy(files)
@@ -777,4 +777,10 @@ addCommandAlias("make-zip", ";restserver/universal:packageBin ;joex/universal:pa
 addCommandAlias("make-deb", ";restserver/debian:packageBin ;joex/debian:packageBin")
 addCommandAlias("make-tools", ";root/toolsPackage")
 addCommandAlias("make-pkg", ";clean ;make ;make-zip ;make-deb ;make-tools")
-addCommandAlias("reformatAll", ";project root ;scalafix ;scalafmtAll")
+
+addCommandAlias("ci", "make; lint; test")
+addCommandAlias(
+  "lint",
+  "scalafmtSbtCheck; scalafmtCheckAll; Compile/scalafix --check; Test/scalafix --check"
+)
+addCommandAlias("fix", "Compile/scalafix; Test/scalafix; scalafmtSbt; scalafmtAll")

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.22.0-SNAPSHOT"
+ThisBuild / version := "0.22.0-SNAPSHOT"