From d2c6db0f49056bfbb63749e700dc68fb4354d8d8 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 19 Jul 2017 18:59:50 +0200 Subject: [PATCH] Fix sbt-shading scripted tests Error not caught on CI because of local caches... --- .../cross-project-shading/project/plugins.sbt | 20 ------------------- .../exclude-dependencies/project/plugins.sbt | 20 ------------------- .../shade-namespace/project/plugins.sbt | 20 ------------------- .../sbt-shading/shading/project/plugins.sbt | 20 ------------------- .../transitive-shading/project/plugins.sbt | 20 ------------------- 5 files changed, 100 deletions(-) diff --git a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/project/plugins.sbt b/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/project/plugins.sbt index fc3a48bf6..046224961 100644 --- a/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/project/plugins.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading-0.13/cross-project-shading/project/plugins.sbt @@ -10,24 +10,4 @@ addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) } -// for the locally publish jarjar -resolvers += Resolver.mavenLocal - -val coursierJarjarVersion = "1.0.1-coursier-SNAPSHOT" - -def coursierJarjarFoundInM2 = - (file(sys.props("user.home")) / s".m2/repository/org/anarres/jarjar/jarjar-core/$coursierJarjarVersion").exists() - -def jarjarVersion = - if (coursierJarjarFoundInM2) - coursierJarjarVersion - else - sys.error( - "Ad hoc jarjar version not found. Run\n" + - " git clone https://github.com/alexarchambault/jarjar.git && cd jarjar && git checkout 249c8dbb970f8 && ./gradlew install\n" + - "to run this test" - ) - -libraryDependencies += "org.anarres.jarjar" % "jarjar-core" % jarjarVersion - addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13") diff --git a/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/plugins.sbt b/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/plugins.sbt index 8f83e814d..022e99e06 100644 --- a/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/plugins.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading/exclude-dependencies/project/plugins.sbt @@ -9,23 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) } - -// for the locally publish jarjar -resolvers += Resolver.mavenLocal - -val coursierJarjarVersion = "1.0.1-coursier-SNAPSHOT" - -def coursierJarjarFoundInM2 = - (file(sys.props("user.home")) / s".m2/repository/org/anarres/jarjar/jarjar-core/$coursierJarjarVersion").exists() - -def jarjarVersion = - if (coursierJarjarFoundInM2) - coursierJarjarVersion - else - sys.error( - "Ad hoc jarjar version not found. Run\n" + - " git clone https://github.com/alexarchambault/jarjar.git && cd jarjar && git checkout 249c8dbb970f8 && ./gradlew install\n" + - "to run this test" - ) - -libraryDependencies += "org.anarres.jarjar" % "jarjar-core" % jarjarVersion diff --git a/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt index 8f83e814d..022e99e06 100644 --- a/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading/shade-namespace/project/plugins.sbt @@ -9,23 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) } - -// for the locally publish jarjar -resolvers += Resolver.mavenLocal - -val coursierJarjarVersion = "1.0.1-coursier-SNAPSHOT" - -def coursierJarjarFoundInM2 = - (file(sys.props("user.home")) / s".m2/repository/org/anarres/jarjar/jarjar-core/$coursierJarjarVersion").exists() - -def jarjarVersion = - if (coursierJarjarFoundInM2) - coursierJarjarVersion - else - sys.error( - "Ad hoc jarjar version not found. Run\n" + - " git clone https://github.com/alexarchambault/jarjar.git && cd jarjar && git checkout 249c8dbb970f8 && ./gradlew install\n" + - "to run this test" - ) - -libraryDependencies += "org.anarres.jarjar" % "jarjar-core" % jarjarVersion diff --git a/sbt-shading/src/sbt-test/sbt-shading/shading/project/plugins.sbt b/sbt-shading/src/sbt-test/sbt-shading/shading/project/plugins.sbt index 8f83e814d..022e99e06 100644 --- a/sbt-shading/src/sbt-test/sbt-shading/shading/project/plugins.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading/shading/project/plugins.sbt @@ -9,23 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) } - -// for the locally publish jarjar -resolvers += Resolver.mavenLocal - -val coursierJarjarVersion = "1.0.1-coursier-SNAPSHOT" - -def coursierJarjarFoundInM2 = - (file(sys.props("user.home")) / s".m2/repository/org/anarres/jarjar/jarjar-core/$coursierJarjarVersion").exists() - -def jarjarVersion = - if (coursierJarjarFoundInM2) - coursierJarjarVersion - else - sys.error( - "Ad hoc jarjar version not found. Run\n" + - " git clone https://github.com/alexarchambault/jarjar.git && cd jarjar && git checkout 249c8dbb970f8 && ./gradlew install\n" + - "to run this test" - ) - -libraryDependencies += "org.anarres.jarjar" % "jarjar-core" % jarjarVersion diff --git a/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/project/plugins.sbt b/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/project/plugins.sbt index 8f83e814d..022e99e06 100644 --- a/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/project/plugins.sbt +++ b/sbt-shading/src/sbt-test/sbt-shading/transitive-shading/project/plugins.sbt @@ -9,23 +9,3 @@ addSbtPlugin("io.get-coursier" % "sbt-shading" % pluginVersion) } - -// for the locally publish jarjar -resolvers += Resolver.mavenLocal - -val coursierJarjarVersion = "1.0.1-coursier-SNAPSHOT" - -def coursierJarjarFoundInM2 = - (file(sys.props("user.home")) / s".m2/repository/org/anarres/jarjar/jarjar-core/$coursierJarjarVersion").exists() - -def jarjarVersion = - if (coursierJarjarFoundInM2) - coursierJarjarVersion - else - sys.error( - "Ad hoc jarjar version not found. Run\n" + - " git clone https://github.com/alexarchambault/jarjar.git && cd jarjar && git checkout 249c8dbb970f8 && ./gradlew install\n" + - "to run this test" - ) - -libraryDependencies += "org.anarres.jarjar" % "jarjar-core" % jarjarVersion