From b27ea623a554e8d21bb60a8b014e9cfaf6f0ff14 Mon Sep 17 00:00:00 2001 From: Amina Adewusi Date: Fri, 30 Apr 2021 16:37:07 +0100 Subject: [PATCH] Fixes failing tests Tests were failing because of bintray migration. Lightbend forgot to move dependencies. This fixes it by upgrading to more modern library dependencies. --- .../build.sbt | 67 +++++++++---------- .../{disabled => test} | 0 .../dependency-graph/whatDependsOn/build.sbt | 61 ++++++++--------- .../whatDependsOn/{disabled => test} | 0 4 files changed, 59 insertions(+), 69 deletions(-) rename sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/{disabled => test} (100%) rename sbt-app/src/sbt-test/dependency-graph/whatDependsOn/{disabled => test} (100%) diff --git a/sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/build.sbt b/sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/build.sbt index 0586054cd..4826145e5 100644 --- a/sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/build.sbt @@ -1,18 +1,11 @@ -ThisBuild / useCoursier := false - -version := "0.1.0-SNAPSHOT" - -organization := "default" +ThisBuild / version := "0.1.0-SNAPSHOT" +ThisBuild / scalaVersion := "2.13.5" name := "whatDependsOn" -scalaVersion := "2.9.1" - -resolvers += "typesafe maven" at "https://repo.typesafe.com/typesafe/maven-releases/" - libraryDependencies ++= Seq( - "com.codahale" % "jerkson_2.9.1" % "0.5.0", - "org.codehaus.jackson" % "jackson-mapper-asl" % "1.9.10" // as another version of asl + "co.fs2" %% "fs2-core" % "1.0.4", + "org.typelevel" %% "cats-effect" % "3.1.0" ) val check = TaskKey[Unit]("check") @@ -23,36 +16,36 @@ check := { require(sanitize(expected) == sanitize(output), s"Tree should have been [\n${sanitize(expected)}\n] but was [\n${sanitize(output)}\n]") val withVersion = - (whatDependsOn in Compile) - .toTask(" org.codehaus.jackson jackson-core-asl 1.9.11") + (Compile / whatDependsOn) + .toTask(" org.typelevel cats-core_2.13 2.6.0") .value - val expectedGraphWithVersion = - """org.codehaus.jackson:jackson-core-asl:1.9.11 - | +-com.codahale:jerkson_2.9.1:0.5.0 [S] - | | +-default:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | | - | +-org.codehaus.jackson:jackson-mapper-asl:1.9.11 - | +-com.codahale:jerkson_2.9.1:0.5.0 [S] - | | +-default:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | | - | +-default:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | """.stripMargin + val expectedGraphWithVersion = { + """org.typelevel:cats-core_2.13:2.6.0 [S] + |+-org.typelevel:cats-effect-kernel_2.13:3.1.0 [S] + |+-org.typelevel:cats-effect-std_2.13:3.1.0 [S] + || +-org.typelevel:cats-effect_2.13:3.1.0 [S] + || +-whatdependson:whatdependson_2.13:0.1.0-SNAPSHOT [S] + || + |+-org.typelevel:cats-effect_2.13:3.1.0 [S] + |+-whatdependson:whatdependson_2.13:0.1.0-SNAPSHOT [S]""".stripMargin + } - checkOutput(withVersion, expectedGraphWithVersion) + checkOutput(withVersion.trim, expectedGraphWithVersion.trim) val withoutVersion = - (whatDependsOn in Compile) - .toTask(" org.codehaus.jackson jackson-mapper-asl") + (Compile / whatDependsOn) + .toTask(" org.typelevel cats-core_2.13") .value val expectedGraphWithoutVersion = - """org.codehaus.jackson:jackson-mapper-asl:1.9.11 - | +-com.codahale:jerkson_2.9.1:0.5.0 [S] - | | +-default:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | | - | +-default:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | - |org.codehaus.jackson:jackson-mapper-asl:1.9.10 (evicted by: 1.9.11) - | +-default:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | """.stripMargin - checkOutput(withoutVersion, expectedGraphWithoutVersion) + """org.typelevel:cats-core_2.13:2.6.0 [S] + |+-org.typelevel:cats-effect-kernel_2.13:3.1.0 [S] + |+-org.typelevel:cats-effect-std_2.13:3.1.0 [S] + || +-org.typelevel:cats-effect_2.13:3.1.0 [S] + || +-whatdependson:whatdependson_2.13:0.1.0-SNAPSHOT [S] + || + |+-org.typelevel:cats-effect_2.13:3.1.0 [S] + |+-whatdependson:whatdependson_2.13:0.1.0-SNAPSHOT [S]""".stripMargin + + checkOutput(withoutVersion.trim, expectedGraphWithoutVersion.trim) + } diff --git a/sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/disabled b/sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/test similarity index 100% rename from sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/disabled rename to sbt-app/src/sbt-test/dependency-graph/whatDependsOn-without-previous-initialization/test diff --git a/sbt-app/src/sbt-test/dependency-graph/whatDependsOn/build.sbt b/sbt-app/src/sbt-test/dependency-graph/whatDependsOn/build.sbt index 8b3a0d5e1..4826145e5 100644 --- a/sbt-app/src/sbt-test/dependency-graph/whatDependsOn/build.sbt +++ b/sbt-app/src/sbt-test/dependency-graph/whatDependsOn/build.sbt @@ -1,13 +1,11 @@ ThisBuild / version := "0.1.0-SNAPSHOT" -ThisBuild / scalaVersion := "2.9.1" +ThisBuild / scalaVersion := "2.13.5" name := "whatDependsOn" -resolvers += "typesafe maven" at "https://repo.typesafe.com/typesafe/maven-releases/" - libraryDependencies ++= Seq( - "com.codahale" % "jerkson_2.9.1" % "0.5.0", - "org.codehaus.jackson" % "jackson-mapper-asl" % "1.9.10" // as another version of asl + "co.fs2" %% "fs2-core" % "1.0.4", + "org.typelevel" %% "cats-effect" % "3.1.0" ) val check = TaskKey[Unit]("check") @@ -18,37 +16,36 @@ check := { require(sanitize(expected) == sanitize(output), s"Tree should have been [\n${sanitize(expected)}\n] but was [\n${sanitize(output)}\n]") val withVersion = - (whatDependsOn in Compile) - .toTask(" org.codehaus.jackson jackson-core-asl 1.9.10") + (Compile / whatDependsOn) + .toTask(" org.typelevel cats-core_2.13 2.6.0") .value - val expectedGraphWithVersion = - """org.codehaus.jackson:jackson-core-asl:1.9.10 - | +-com.codahale:jerkson_2.9.1:0.5.0 [S] - | | +-whatdependson:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | | - | +-org.codehaus.jackson:jackson-mapper-asl:1.9.10 - | +-com.codahale:jerkson_2.9.1:0.5.0 [S] - | | +-whatdependson:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | | - | +-whatdependson:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | """.stripMargin + val expectedGraphWithVersion = { + """org.typelevel:cats-core_2.13:2.6.0 [S] + |+-org.typelevel:cats-effect-kernel_2.13:3.1.0 [S] + |+-org.typelevel:cats-effect-std_2.13:3.1.0 [S] + || +-org.typelevel:cats-effect_2.13:3.1.0 [S] + || +-whatdependson:whatdependson_2.13:0.1.0-SNAPSHOT [S] + || + |+-org.typelevel:cats-effect_2.13:3.1.0 [S] + |+-whatdependson:whatdependson_2.13:0.1.0-SNAPSHOT [S]""".stripMargin + } - checkOutput(withVersion, expectedGraphWithVersion) + checkOutput(withVersion.trim, expectedGraphWithVersion.trim) val withoutVersion = - (whatDependsOn in Compile) - .toTask(" org.codehaus.jackson jackson-mapper-asl") + (Compile / whatDependsOn) + .toTask(" org.typelevel cats-core_2.13") .value val expectedGraphWithoutVersion = - """org.codehaus.jackson:jackson-mapper-asl:1.9.10 - | +-com.codahale:jerkson_2.9.1:0.5.0 [S] - | | +-whatdependson:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | | - | +-whatdependson:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | - |org.codehaus.jackson:jackson-mapper-asl:[1.9.0,2.0.0) (evicted by: 1.9.10) - | +-com.codahale:jerkson_2.9.1:0.5.0 [S] - | +-whatdependson:whatdependson_2.9.1:0.1.0-SNAPSHOT [S] - | """.stripMargin - checkOutput(withoutVersion, expectedGraphWithoutVersion) + """org.typelevel:cats-core_2.13:2.6.0 [S] + |+-org.typelevel:cats-effect-kernel_2.13:3.1.0 [S] + |+-org.typelevel:cats-effect-std_2.13:3.1.0 [S] + || +-org.typelevel:cats-effect_2.13:3.1.0 [S] + || +-whatdependson:whatdependson_2.13:0.1.0-SNAPSHOT [S] + || + |+-org.typelevel:cats-effect_2.13:3.1.0 [S] + |+-whatdependson:whatdependson_2.13:0.1.0-SNAPSHOT [S]""".stripMargin + + checkOutput(withoutVersion.trim, expectedGraphWithoutVersion.trim) + } diff --git a/sbt-app/src/sbt-test/dependency-graph/whatDependsOn/disabled b/sbt-app/src/sbt-test/dependency-graph/whatDependsOn/test similarity index 100% rename from sbt-app/src/sbt-test/dependency-graph/whatDependsOn/disabled rename to sbt-app/src/sbt-test/dependency-graph/whatDependsOn/test