From c3e23db5febcf068fabb0e84e3134fd1dde7c5da Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 7 Jul 2015 20:19:52 +0100 Subject: [PATCH 1/2] Windows-friendlier filenames --- .../argonaut-shapeless_6.1_2.11/0.2.0} | 0 .../argonaut-shapeless_6.1_2.11/0.2.0.jcabi} | 0 .../coursier_2.11/0.1.0-SNAPSHOT} | 0 .../java-logging/1.2-SNAPSHOT} | 0 .../spark-core_2.11/1.3.1} | 0 .../spark-core_2.11/1.3.1.jcabi} | 0 core/src/test/scala/coursier/test/CentralTests.scala | 2 +- 7 files changed, 1 insertion(+), 1 deletion(-) rename core/src/test/resources/resolutions/{com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0 => com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0} (100%) rename core/src/test/resources/resolutions/{com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0.jcabi => com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0.jcabi} (100%) rename core/src/test/resources/resolutions/{com.github.alexarchambault:coursier_2.11:0.1.0-SNAPSHOT => com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT} (100%) rename core/src/test/resources/resolutions/{com.github.fommil:java-logging:1.2-SNAPSHOT => com.github.fommil/java-logging/1.2-SNAPSHOT} (100%) rename core/src/test/resources/resolutions/{org.apache.spark:spark-core_2.11:1.3.1 => org.apache.spark/spark-core_2.11/1.3.1} (100%) rename core/src/test/resources/resolutions/{org.apache.spark:spark-core_2.11:1.3.1.jcabi => org.apache.spark/spark-core_2.11/1.3.1.jcabi} (100%) diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0 b/core/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 similarity index 100% rename from core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0 rename to core/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0 diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0.jcabi b/core/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0.jcabi similarity index 100% rename from core/src/test/resources/resolutions/com.github.alexarchambault:argonaut-shapeless_6.1_2.11:0.2.0.jcabi rename to core/src/test/resources/resolutions/com.github.alexarchambault/argonaut-shapeless_6.1_2.11/0.2.0.jcabi diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault:coursier_2.11:0.1.0-SNAPSHOT b/core/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT similarity index 100% rename from core/src/test/resources/resolutions/com.github.alexarchambault:coursier_2.11:0.1.0-SNAPSHOT rename to core/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT diff --git a/core/src/test/resources/resolutions/com.github.fommil:java-logging:1.2-SNAPSHOT b/core/src/test/resources/resolutions/com.github.fommil/java-logging/1.2-SNAPSHOT similarity index 100% rename from core/src/test/resources/resolutions/com.github.fommil:java-logging:1.2-SNAPSHOT rename to core/src/test/resources/resolutions/com.github.fommil/java-logging/1.2-SNAPSHOT diff --git a/core/src/test/resources/resolutions/org.apache.spark:spark-core_2.11:1.3.1 b/core/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 similarity index 100% rename from core/src/test/resources/resolutions/org.apache.spark:spark-core_2.11:1.3.1 rename to core/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1 diff --git a/core/src/test/resources/resolutions/org.apache.spark:spark-core_2.11:1.3.1.jcabi b/core/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1.jcabi similarity index 100% rename from core/src/test/resources/resolutions/org.apache.spark:spark-core_2.11:1.3.1.jcabi rename to core/src/test/resources/resolutions/org.apache.spark/spark-core_2.11/1.3.1.jcabi diff --git a/core/src/test/scala/coursier/test/CentralTests.scala b/core/src/test/scala/coursier/test/CentralTests.scala index e3339a740..6747537e0 100644 --- a/core/src/test/scala/coursier/test/CentralTests.scala +++ b/core/src/test/scala/coursier/test/CentralTests.scala @@ -51,7 +51,7 @@ object CentralTests extends TestSuite { async { val expected = await( - textResource(s"resolutions/${module.organization}:${module.name}:$version") + textResource(s"resolutions/${module.organization}/${module.name}/$version") ) .split('\n') .toSeq From 06a895b2cb4d04c72a46116d53e1a4e644ba506e Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 7 Jul 2015 20:19:54 +0100 Subject: [PATCH 2/2] Switch to scala 2.11.7 --- .../com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT | 2 +- project/Coursier.scala | 4 ++-- project/plugins.sbt | 2 +- project/travis.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT b/core/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT index b7674ef1d..ed11fd041 100644 --- a/core/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT +++ b/core/src/test/resources/resolutions/com.github.alexarchambault/coursier_2.11/0.1.0-SNAPSHOT @@ -1,7 +1,7 @@ com.github.alexarchambault:coursier_2.11:jar:0.1.0-SNAPSHOT org.scala-lang.modules:scala-parser-combinators_2.11:jar:1.0.4 org.scala-lang.modules:scala-xml_2.11:jar:1.0.4 -org.scala-lang:scala-library:jar:2.11.6 +org.scala-lang:scala-library:jar:2.11.7 org.scalaz:scalaz-concurrent_2.11:jar:7.1.2 org.scalaz:scalaz-core_2.11:jar:7.1.2 org.scalaz:scalaz-effect_2.11:jar:7.1.2 diff --git a/project/Coursier.scala b/project/Coursier.scala index 8555dddf7..80a4f8dd6 100644 --- a/project/Coursier.scala +++ b/project/Coursier.scala @@ -57,8 +57,8 @@ object CoursierBuild extends Build { lazy val commonSettings = Seq[Setting[_]]( organization := "com.github.alexarchambault", - scalaVersion := "2.11.6", - crossScalaVersions := Seq("2.10.5", "2.11.6"), + scalaVersion := "2.11.7", + crossScalaVersions := Seq("2.10.5", "2.11.7"), resolvers ++= Seq( "Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases", Resolver.sonatypeRepo("releases") diff --git a/project/plugins.sbt b/project/plugins.sbt index 97c689d78..dcd3228a0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.6.8") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.3") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.4") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") diff --git a/project/travis.sh b/project/travis.sh index e18038e87..2424df814 100755 --- a/project/travis.sh +++ b/project/travis.sh @@ -35,7 +35,7 @@ else fi # Required for ~/.ivy2/local repo tests -sbt ++2.11.6 core-jvm/publish-local +sbt core-jvm/publish-local SBT_COMMANDS="$SBT_COMMANDS test"