From 4796c0962d15d36e36da916359e357645209a756 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 15 Jun 2017 17:24:19 +0200 Subject: [PATCH] Don't force downloading stuff in scripted tests In the hope of speeding them up a bit on CI --- .../src/sbt-test/sbt-coursier/aar-packaging/build.sbt | 7 ------- .../sbt-coursier/credentials-from-file/build.sbt | 7 ------- .../src/sbt-test/sbt-coursier/credentials-sbt/build.sbt | 7 ------- .../src/sbt-test/sbt-coursier/credentials/build.sbt | 7 ------- .../sbt-test/sbt-coursier/exclude-dependencies/build.sbt | 7 ------- .../fallback-dependencies-inter-project/build.sbt | 8 +------- .../src/sbt-test/sbt-coursier/from-no-head/build.sbt | 7 ------- sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt | 9 +-------- .../hadoop-yarn-server-resourcemanager/build.sbt | 7 ------- .../sbt-coursier/inter-project-resolvers/build.sbt | 8 +------- .../src/sbt-test/sbt-coursier/inter-project/build.sbt | 8 +------- .../src/sbt-test/sbt-coursier/maven-compatible/build.sbt | 7 ------- .../src/sbt-test/sbt-coursier/profiles/build.sbt | 7 ------- .../src/sbt-test/sbt-coursier/scala-jars/build.sbt | 7 ------- .../sbt-coursier/scala-sources-javadoc-jars/build.sbt | 9 +-------- sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt | 7 ------- .../typelevel-force-version-stdlib/build.sbt | 7 ------- .../src/sbt-test/sbt-coursier/typelevel/build.sbt | 7 ------- .../src/sbt-test/sbt-coursier/zookeeper/build.sbt | 7 ------- 19 files changed, 5 insertions(+), 135 deletions(-) diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt index ec102b4f9..97b5c2cff 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt @@ -4,10 +4,3 @@ libraryDependencies += ("com.rengwuxian.materialedittext" % "library" % "2.1.4") .exclude("com.android.support", "support-v4") .exclude("com.android.support", "support-annotations") .exclude("com.android.support", "appcompat-v7") - -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt index ddec377a8..49e4b5f44 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt @@ -4,11 +4,4 @@ resolvers += "authenticated" at "http://localhost:8080" coursierCredentials += "authenticated" -> coursier.Credentials(file("credentials")) -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} - libraryDependencies += "com.abc" % "test" % "0.1" diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt index c8c8c3668..bc325e22f 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt @@ -5,11 +5,4 @@ resolvers += "authenticated" at "http://localhost:8080" coursierUseSbtCredentials := true credentials += Credentials("", "localhost", "user", "pass") -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} - libraryDependencies += "com.abc" % "test" % "0.1" diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt index 28a48f79a..eca8505e1 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt @@ -4,11 +4,4 @@ resolvers += "authenticated" at "http://localhost:8080" coursierCredentials += "authenticated" -> coursier.Credentials("user", "pass") -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} - libraryDependencies += "com.abc" % "test" % "0.1" diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt index 6c0d86ed7..3fcf77430 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt @@ -8,13 +8,6 @@ organization := "io.get-coursier.test" name := "sbt-coursier-exclude-dependencies" version := "0.1.0-SNAPSHOT" -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} - libraryDependencies += "com.github.alexarchambault" %% "argonaut-shapeless_6.1" % "1.0.0-RC1" excludeDependencies += SbtExclusionRule("com.chuusai", "shapeless_2.11") diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt index 9394f7ad7..93f7aa347 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt @@ -16,11 +16,5 @@ lazy val root = project lazy val sharedSettings = Seq( - scalaVersion := "2.11.8", - coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) - } + scalaVersion := "2.11.8" ) diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt index cdfa63ccf..bba414888 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt @@ -1,10 +1,3 @@ scalaVersion := "2.11.8" -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} - libraryDependencies += "ccl.northwestern.edu" % "netlogo" % "5.3.1" % "provided" from s"https://github.com/NetLogo/NetLogo/releases/download/5.3.1/NetLogo.jar" diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt index 4002a114f..355f1d74c 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt @@ -1,12 +1,5 @@ scalaVersion := "2.11.8" -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} - libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.41" from { val f = file(sys.props("sbttest.base")) / "sbt-coursier" / "from" / "shapeless_2.11-2.3.0.jar" @@ -35,4 +28,4 @@ libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.41" from { } f.toURI.toString -} \ No newline at end of file +} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt index c7c7eda96..983b4325e 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt @@ -1,10 +1,3 @@ scalaVersion := "2.11.8" libraryDependencies += "org.apache.hadoop" % "hadoop-yarn-server-resourcemanager" % "2.7.1" - -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt index 4ede93632..d375b4ab6 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt @@ -20,11 +20,5 @@ lazy val root = project lazy val sharedSettings = Seq( - scalaVersion := "2.11.8", - coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) - } + scalaVersion := "2.11.8" ) diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt index 8cb64b323..ca35179d2 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt @@ -1,12 +1,6 @@ lazy val sharedSettings = Seq( - scalaVersion := "2.11.8", - coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) - } + scalaVersion := "2.11.8" ) /** Module with the same Maven coordinates as shapeless 2.3.1 */ diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt index f44f79c32..baab5b347 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt @@ -1,12 +1,5 @@ scalaVersion := "2.11.8" -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} - resolvers += Resolver.url( "webjars-bintray", new URL("https://dl.bintray.com/scalaz/releases/") diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt index b0209d82c..becbd3496 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt @@ -3,10 +3,3 @@ scalaVersion := "2.11.8" libraryDependencies += "org.apache.spark" %% "spark-sql" % "1.6.2" mavenProfiles += "hadoop-2.6" - -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt index 998a4a95b..ed222e272 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt @@ -1,8 +1 @@ scalaVersion := appConfiguration.value.provider.scalaProvider.version - -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt index bb4dfcae2..30308c1b3 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt @@ -1,12 +1,5 @@ scalaVersion := appConfiguration.value.provider.scalaProvider.version -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} - lazy val updateClassifiersCheck = TaskKey[Unit]("updateClassifiersCheck") updateClassifiersCheck := { @@ -43,4 +36,4 @@ updateClassifiersCheck := { ensureHasClassifierArtifact("javadoc") ensureHasClassifierArtifact("sources") -} \ No newline at end of file +} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt index 9725a4306..c03b2c8be 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt @@ -1,8 +1 @@ scalaVersion := "2.11.8" - -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt index 5516cb1c9..2cc50fde5 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt @@ -4,10 +4,3 @@ scalacOptions += "-Xexperimental" // no effect, as the right version is forced anyway (to scalaVersion.value) libraryDependencies += "org.typelevel" % "scala-library" % "2.11.12345" - -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt index ea4504032..6a6bacd66 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt @@ -1,10 +1,3 @@ scalaOrganization := "org.typelevel" scalaVersion := "2.11.7" scalacOptions += "-Xexperimental" - -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -} diff --git a/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt b/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt index 7dd1d9f7d..ebeefdbd8 100644 --- a/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt +++ b/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt @@ -1,10 +1,3 @@ scalaVersion := "2.11.8" libraryDependencies += "org.apache.zookeeper" % "zookeeper" % "3.5.0-alpha" - -coursierCachePolicies := { - if (sys.props("os.name").startsWith("Windows")) - coursierCachePolicies.value - else - Seq(coursier.CachePolicy.ForceDownload) -}