From 1515091b7d4eae1ce0ca1d26a5d5eaa7b0c4d62d Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Thu, 10 Feb 2022 22:29:40 +0100 Subject: [PATCH] Update dependencies in series/2.x --- .github/workflows/ci.yml | 4 ++-- build.sbt | 6 +++--- project/build.properties | 2 +- project/plugins.sbt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e7b21355..5ec73ea69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.11.12, 2.12.13, 2.13.6] + scala: [2.11.12, 2.12.15, 2.13.8] java: [adopt@1.8] platform: [jvm, js, native] runs-on: ${{ matrix.os }} @@ -75,7 +75,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.6] + scala: [2.13.8] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 6685b118c..43f890869 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,8 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject import sbtcrossproject.CrossProject val Scala211 = "2.11.12" -val Scala212 = "2.12.13" -val Scala213 = "2.13.6" +val Scala212 = "2.12.15" +val Scala213 = "2.13.8" commonSettings noPublishSettings @@ -216,7 +216,7 @@ lazy val examples = crossProject(JSPlatform, JVMPlatform, NativePlatform).crossT libraryDependencies ++= { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, scalaMajor)) if scalaMajor >= 11 => - Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "2.0.0") + Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.0") case _ => Nil } diff --git a/project/build.properties b/project/build.properties index e67343ae7..c8fcab543 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.0 +sbt.version=1.6.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 44a80992f..7d02ee983 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,8 +6,8 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0. addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1")