Merge branch 'master' into update/lift-json-3.5.0

Author: foundweekends-bot[bot]

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: olafurpg/setup-scala@v13
       with:
         java-version: "[email protected]"
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
     - run: ./setup.sh
     - run: ~/.conscript/bin/cs --version
   setup_script_windows:
@@ -22,7 +22,7 @@ jobs:
     - uses: olafurpg/setup-scala@v13
       with:
         java-version: "[email protected]"
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
     - run: Powershell.exe -File setup.ps1
     - shell: cmd
       run: "%HOMEDRIVE%%HOMEPATH%\\.conscript\\bin\\cs --version"
@@ -39,7 +39,7 @@ jobs:
     - uses: olafurpg/setup-scala@v13
       with:
         java-version: "adopt@1.${{ matrix.java }}"
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
     - uses: coursier/cache-action@v6
     - run: sbt -v test
     - run: |
@@ -53,11 +53,11 @@ jobs:
     - uses: olafurpg/setup-scala@v13
       with:
         java-version: "[email protected]"
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
       with:
         fetch-depth: 10
     - uses: coursier/cache-action@v6
-    - uses: webfactory/[email protected].3
+    - uses: webfactory/[email protected].4
       if: ${{ !github.event.repository.fork && github.ref == 'refs/heads/master' && github.event_name == 'push' }}
       with:
         ssh-private-key: ${{ secrets.DEPLOY_KEY_1 }}

.github/workflows/scala-steward.yml

@@ -18,7 +18,7 @@ jobs:
         private_key: ${{ secrets.FOUNDWEEKENDS_BOT_KEY }}
     - name: Launch Scala Steward
       if: ${{ !github.event.repository.fork }}
-      uses: scala-steward-org/scala-steward-action@v2.13.5
+      uses: scala-steward-org/scala-steward-action@v2.16.0
       with:
         github-token: ${{ steps.generate_token.outputs.token }}
         author-email: "74864734+foundweekends-bot[bot]@users.noreply.github.com"

project/Dependencies.scala

@@ -3,8 +3,8 @@ import sbt._
 object Dependencies {
   val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.3.3"
   val scalaSwing        = "org.scala-lang.modules" %% "scala-swing" % "3.0.0"
-  val dispatchCore      = "net.databinder.dispatch" %% "dispatch-core" % "0.11.2"
+  val dispatchCore      = "net.databinder.dispatch" %% "dispatch-core" % "0.12.3"
   val scopt             = "com.github.scopt" %% "scopt" % "4.0.1"
-  val liftJson          = "net.liftweb" %% "lift-json" % "3.5.0"
-  val slf4jJdk14        = "org.slf4j" % "slf4j-jdk14" % "1.7.32"
+  val liftJson          = "net.liftweb" %% "lift-json" % "2.6.3"
+  val slf4jJdk14        = "org.slf4j" % "slf4j-jdk14" % "1.7.33"
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.6.1

sbt-conscript/src/main/scala/ConscriptPlugin.scala

@@ -16,8 +16,8 @@ object ConscriptPlugin extends AutoPlugin {
   import autoImport._
   override def projectSettings: Seq[Def.Setting[_]] =
     List(
-      csSbtLauncherVersion := "1.1.6",
-      libraryDependencies += "org.scala-sbt" % "launcher" % csSbtLauncherVersion.value % "provided",
+      csSbtLauncherVersion := "1.3.3",
+      libraryDependencies += "org.scala-sbt" % "launcher-interface" % csSbtLauncherVersion.value % "provided",
       sourceDirectory in csRun := { (sourceDirectory in Compile).value / conscriptStr },
       target in csRun := { target.value / conscriptStr },
       csBoot := { (target in csRun).value / "boot" },

setup.ps1

@@ -68,7 +68,7 @@ echo "
 echo "@echo off
 java %JAVA_OPTS% -jar $CS\sbt-launch.jar @file:\$CLC %*" | Out-File -Encoding "ASCII" "$BIN\cs.bat"
 
-$LJV = "1.1.6"
+$LJV = "1.3.3"
 $LJ = "launcher-$LJV.jar"
 
 # If launcher is not in configuration directory

setup.sh

@@ -40,7 +40,7 @@ java \$JAVA_OPTS -jar $CS/sbt-launch.jar @$CLC \"\$@\"" > "$BIN/cs"
 
 chmod a+x "$BIN/cs"
 
-LJV=1.1.6
+LJV=1.3.3
 LJ="launcher-$LJV.jar"
 
 # If launcher is not in configuration directory

src/main/conscript/cs/launchconfig

@@ -1,5 +1,5 @@
 [app]
-  version: 0.5.6
+  version: 0.5.8
   org: org.foundweekends.conscript
   name: conscript
   class: conscript.Conscript

src/main/scala/conscript.scala

@@ -8,7 +8,7 @@ object Conscript {
   import dispatch.{ BuildInfo => _, _ }
   import Apply.exec
   val http = dispatch.Http.configure { configBuilder =>
-    configBuilder.setFollowRedirects(true)
+    configBuilder.setFollowRedirect(true)
   }
 
   private[this] def shutdownDispatch(): Unit = {

src/main/scala/launch.scala

@@ -9,7 +9,7 @@ trait Launch extends Credentials {
   import scala.concurrent.ExecutionContext.Implicits.global
 
   val sbtlaunchalias = "sbt-launch.jar"
-  val sbtLauncherVersion = "1.1.6"
+  val sbtLauncherVersion = "1.3.3"
 
   def launchJar(display: Display): Either[String, String] =
       configdir(s"launcher-$sbtLauncherVersion.jar") match {