From ce9cd13d93f8792f83a9c5cd2206b037b2012941 Mon Sep 17 00:00:00 2001 From: Daniel Shuy Date: Fri, 31 Jan 2020 23:14:03 +0800 Subject: [PATCH] Revert "Update SBT to 1.3.2 (#19)" This reverts commit d5b673733d71e29e6a65a2d73625a529ecc83339. # Conflicts: # src/sbt-test/sbt-1.0/compile/project/plugins.sbt # src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/plugins.sbt --- build.sbt | 2 +- project/build.properties | 2 +- src/sbt-test/sbt-1.0/compile/project/build.properties | 2 +- src/sbt-test/sbt-1.0/compile/project/plugins.sbt | 2 -- .../sbt-1.0/liquibase-slick-codegen/project/build.properties | 2 +- .../sbt-1.0/liquibase-slick-codegen/project/plugins.sbt | 2 -- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 341e637..dd38d88 100644 --- a/build.sbt +++ b/build.sbt @@ -34,7 +34,7 @@ addSbtPlugin("com.permutive" % "sbt-liquibase" % "1.2.0") crossSbtVersions := Seq( "0.13.17", - "1.3.2" + "1.2.6" ) def slickVersion(scalaVersion: String) = diff --git a/project/build.properties b/project/build.properties index 218101f..091249b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.3.2 +sbt.version = 1.2.6 diff --git a/src/sbt-test/sbt-1.0/compile/project/build.properties b/src/sbt-test/sbt-1.0/compile/project/build.properties index 218101f..091249b 100644 --- a/src/sbt-test/sbt-1.0/compile/project/build.properties +++ b/src/sbt-test/sbt-1.0/compile/project/build.properties @@ -1 +1 @@ -sbt.version = 1.3.2 +sbt.version = 1.2.6 diff --git a/src/sbt-test/sbt-1.0/compile/project/plugins.sbt b/src/sbt-test/sbt-1.0/compile/project/plugins.sbt index aeb495c..21939ee 100644 --- a/src/sbt-test/sbt-1.0/compile/project/plugins.sbt +++ b/src/sbt-test/sbt-1.0/compile/project/plugins.sbt @@ -4,7 +4,5 @@ sys.props.get("plugin.version") match { |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } -useCoursier := false - addSbtPlugin("com.github.daniel-shuy" % "sbt-scripted-scalatest" % "2.0.0") libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0" diff --git a/src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/build.properties b/src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/build.properties index 218101f..091249b 100644 --- a/src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/build.properties +++ b/src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/build.properties @@ -1 +1 @@ -sbt.version = 1.3.2 +sbt.version = 1.2.6 diff --git a/src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/plugins.sbt b/src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/plugins.sbt index aeb495c..21939ee 100644 --- a/src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/plugins.sbt +++ b/src/sbt-test/sbt-1.0/liquibase-slick-codegen/project/plugins.sbt @@ -4,7 +4,5 @@ sys.props.get("plugin.version") match { |Specify this property using the scriptedLaunchOpts -D.""".stripMargin) } -useCoursier := false - addSbtPlugin("com.github.daniel-shuy" % "sbt-scripted-scalatest" % "2.0.0") libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0"