From 3f0129cba3be339e8e887890724208c792f38b90 Mon Sep 17 00:00:00 2001 From: James Santucci Date: Mon, 7 Feb 2022 12:10:15 -0700 Subject: [PATCH 1/4] Update plugin to 0.7.1 --- build.sbt | 4 ++-- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 8763c6be..5524b6af 100644 --- a/build.sbt +++ b/build.sbt @@ -16,8 +16,8 @@ lazy val exercises = (project in file(".")) .settings(name := "exercises-stdlib") .settings( libraryDependencies ++= Seq( - "org.scala-exercises" %% "exercise-compiler" % "0.6.7", - "org.scala-exercises" %% "definitions" % "0.6.7", + "org.scala-exercises" %% "exercise-compiler" % "0.7.1", + "org.scala-exercises" %% "definitions" % "0.7.1", "com.chuusai" %% "shapeless" % "2.3.7", "org.scalatest" %% "scalatest" % "3.2.10", "org.scalacheck" %% "scalacheck" % "1.15.4", diff --git a/project/plugins.sbt b/project/plugins.sbt index 22e70c7b..1386226f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.6.7") +addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.7.1") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From c197067ddeaafeb1d3170d6f10b24dc26c1e552d Mon Sep 17 00:00:00 2001 From: James Santucci Date: Mon, 7 Feb 2022 13:06:12 -0700 Subject: [PATCH 2/4] Publish snapshot on this branch --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a90ef3f..04c9549c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,9 @@ on: release: types: [published] push: - branches: main + branches: + - main + - update/sbt-exercise-0.7.1 jobs: release: From 370de1872253fdfa97aee72e8587332f7eb82bca Mon Sep 17 00:00:00 2001 From: James Santucci Date: Tue, 8 Feb 2022 11:14:18 -0700 Subject: [PATCH 3/4] upgrade scalatestplus, ugprade sbt-exercise --- build.sbt | 17 ++++++++++++----- project/plugins.sbt | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 5524b6af..4d972825 100644 --- a/build.sbt +++ b/build.sbt @@ -4,6 +4,13 @@ ThisBuild / organization := "org.scala-exercises" ThisBuild / githubOrganization := "47degrees" ThisBuild / scalaVersion := "2.13.8" +// Required to prevent errors for eviction from binary incompatible dependency +// resolutions. +// See also: https://github.com/scala-exercises/exercises-cats/pull/267 +ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always" + +ThisBuild / resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" + // This is required by the exercises compiler: publishLocal := (publishLocal dependsOn compile).value publishSigned := (publishSigned dependsOn compile).value @@ -16,13 +23,13 @@ lazy val exercises = (project in file(".")) .settings(name := "exercises-stdlib") .settings( libraryDependencies ++= Seq( - "org.scala-exercises" %% "exercise-compiler" % "0.7.1", - "org.scala-exercises" %% "definitions" % "0.7.1", + "org.scala-exercises" %% "exercise-compiler" % "0.7.1+14-b94ba7a2-SNAPSHOT", + "org.scala-exercises" %% "definitions" % "0.7.1+14-b94ba7a2-SNAPSHOT", "com.chuusai" %% "shapeless" % "2.3.7", - "org.scalatest" %% "scalatest" % "3.2.10", + "org.scalatest" %% "scalatest" % "3.2.11", "org.scalacheck" %% "scalacheck" % "1.15.4", - "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0", - "com.github.alexarchambault" %% "scalacheck-shapeless_1.15" % "1.3.0" + "com.github.alexarchambault" %% "scalacheck-shapeless_1.15" % "1.3.0", + "org.scalatestplus" %% "scalacheck-1-15" % "3.2.9.0" % Test ) ) .enablePlugins(ExerciseCompilerPlugin) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1386226f..a9119e82 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.7.1") +addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.7.1+14-b94ba7a2-SNAPSHOT") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From ee7989419d9b3f1ee23c3d801e77128a352e1e7a Mon Sep 17 00:00:00 2001 From: James Santucci Date: Tue, 8 Feb 2022 16:42:39 -0700 Subject: [PATCH 4/4] maybe just updating scalatestplus will be enough --- build.sbt | 6 ++---- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 4d972825..a2c9a028 100644 --- a/build.sbt +++ b/build.sbt @@ -9,8 +9,6 @@ ThisBuild / scalaVersion := "2.13.8" // See also: https://github.com/scala-exercises/exercises-cats/pull/267 ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always" -ThisBuild / resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" - // This is required by the exercises compiler: publishLocal := (publishLocal dependsOn compile).value publishSigned := (publishSigned dependsOn compile).value @@ -23,8 +21,8 @@ lazy val exercises = (project in file(".")) .settings(name := "exercises-stdlib") .settings( libraryDependencies ++= Seq( - "org.scala-exercises" %% "exercise-compiler" % "0.7.1+14-b94ba7a2-SNAPSHOT", - "org.scala-exercises" %% "definitions" % "0.7.1+14-b94ba7a2-SNAPSHOT", + "org.scala-exercises" %% "exercise-compiler" % "0.7.1", + "org.scala-exercises" %% "definitions" % "0.7.1", "com.chuusai" %% "shapeless" % "2.3.7", "org.scalatest" %% "scalatest" % "3.2.11", "org.scalacheck" %% "scalacheck" % "1.15.4", diff --git a/project/plugins.sbt b/project/plugins.sbt index a9119e82..1386226f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.7.1+14-b94ba7a2-SNAPSHOT") +addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.7.1") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")