Switch cli to scala 2.12 and latest case-app

.travis.yml

@@ -10,18 +10,18 @@ script:
 #    - bash <(curl -s https://codecov.io/bash)
 matrix:
   include:
-    - env: SCALA_VERSION=2.12.4 PUBLISH=1
+    - env: SCALA_VERSION=2.12.4 NATIVE=1 PUBLISH=1
       os: linux
       jdk: oraclejdk8
       sudo: required
+      before_install:
+      - curl https://raw.githubusercontent.com/scala-native/scala-native/v0.3.6/bin/travis_setup.sh | bash -x
       services:
         - docker
     - env: SCALA_VERSION=2.11.11 PUBLISH=1
       os: linux
       jdk: oraclejdk8
       sudo: required
-      before_install:
-      - curl https://raw.githubusercontent.com/scala-native/scala-native/e9df70ce671c58f34eab530a44875d6f818ba8fe/bin/travis_setup.sh | bash -x
       services:
         - docker
     - env: SCALA_VERSION=2.10.6 PUBLISH=1
@@ -57,7 +57,7 @@ matrix:
       jdk: oraclejdk8
       script:
         # Sanity check for Pants build path.
-        - ./pants run cli/src/main/scala-2.11:coursier-cli -- fetch --help
+        - ./pants run cli/src/main/scala-2.12:coursier-cli -- fetch --help
 env:
   global:
   - secure: miHFMwVRD/yjOLy794nOwc2lJTMyL5O0MXABT9ksg5ejQy1FrFVc2YH86Agp80W02/lGLGl0qWCiK1TBcs9q4Apt01nkD1a/0/iuTRm//bdhnu8BbRxFITf+2cyYJVytKPsF585aHldMv1rwZs3TDaTzEEecAEki5r50yyTVo7ycG0lVj9aVWXerKRMIT54Wb8M6nqbyRB1jGWT0ETNU13vOvQznPTUXQG5hsiKnGYRf8T3umOMdOHpV0rvdwYqAIMsikaAFcYCS5P/pLXMtmRHICH9KUG8TV/ST07p1BXtbBg9y1Q+lpnXotXh4ZNoWOp8B6v7fxJ/WlLYTDROWCiHJ4s2V4Di00db/nW4OWrEEBlrh7vJ/npZqyt9V9YeNv6alxi+DCESwusgvD4Cx5c3zh+2X6RB6BYwWHlFnd80rmsLe4R4fFUcc8E/ZR9vUFjP1CsQKqfJ5yfKR6V+n8jK8FjLpoaU9PHPo2H4V3FZM/fCLcxhE37vfaYI7/O7MqE/cdGpZIuz7g3c4toWCgNZJDn8iJCPmrgcbW5zbfDxvWU2K816ycgnUwSQ5dufrJpAbLNrjR1O8EPRkMDDp9bB7/4RVQvfDfP9GGoiHPHHgxGzY0Lf5bm+Bj1mRfB5/SXHd3IjhUCD9q7eD1/ANifEYALC5BJ4TB8RhQUPU8uM=

3rdparty/jvm/BUILD

@@ -147,14 +147,14 @@ jar_library(
     name = "scala-native",
     jars = [
         jar(
-            name = "nativelib_native0.3_2.11",
+            name = "nativelib_native0.3_2.12",
             org = "org.scala-native",
-            rev = "0.3.3",
+            rev = "0.3.6",
         ),
         jar(
-            name = "tools_2.11",
-            org = "io.get-coursier.scala-native",
-            rev = "0.3.0-coursier-1",
+            name = "tools_2.12",
+            org = "org.scala-native",
+            rev = "0.3.6",
         ),
     ],
 )

appveyor.yml

@@ -15,10 +15,10 @@ install:
   - cmd: SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - git submodule update --init --recursive
 build_script:
-  - sbt ++2.11.11 clean compile coreJVM/publishLocal cli/publishLocal
+  - sbt ++2.11.12 clean compile coreJVM/publishLocal
   - sbt ++2.10.6 clean compile
-  - sbt ++2.12.4 coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal # to make the scripted sbt 1.0 tests happy
-  - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal # to make the scripted sbt 0.13 tests happy
+  - sbt ++2.12.4 coreJVM/publishLocal cache/publishLocal cli/publishLocal extra/publishLocal sbt-shared/publishLocal
+  - sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal extra/publishLocal sbt-shared/publishLocal
 test_script:
   - ps: Start-Job -filepath .\scripts\start-it-auth-server.ps1 -ArgumentList $pwd
   - ps: Start-Sleep -s 15 # wait for the first server to have downloaded its dependencies

build.sbt

@@ -124,12 +124,13 @@ lazy val extra = project
     coursierPrefix,
     shading,
     libs ++= {
-      if (scalaBinaryVersion.value == "2.11")
+      if (scalaBinaryVersion.value == "2.12")
         Seq(
           Deps.scalaNativeTools % "shaded",
-          // brought by only tools, so should be automaticaly shaded,
-	  // but issues in ShadingPlugin (with things published locally?)
-	  // seem to require explicit shading...
+          // Still applies?
+          //   brought by only tools, so should be automatically shaded,
+	        //   but issues in ShadingPlugin (with things published locally?)
+	        //   seem to require explicit shading...
           Deps.scalaNativeNir % "shaded",
           Deps.scalaNativeUtil % "shaded",
           Deps.fastParse % "shaded"
@@ -154,11 +155,11 @@ lazy val cli = project
   .enablePlugins(PackPlugin, SbtProguard)
   .settings(
     shared,
-    dontPublishIn("2.10", "2.12"),
+    dontPublishIn("2.10", "2.11"),
     coursierPrefix,
     unmanagedResources.in(Test) += packageBin.in(bootstrap).in(Compile).value,
     libs ++= {
-      if (scalaBinaryVersion.value == "2.11")
+      if (scalaBinaryVersion.value == "2.12")
         Seq(
           Deps.caseApp,
           Deps.argonautShapeless,
@@ -168,6 +169,12 @@ lazy val cli = project
       else
         Seq()
     },
+    mainClass.in(Compile) := {
+      if (scalaBinaryVersion.value == "2.12")
+        Some("coursier.cli.Coursier")
+      else
+        None
+    },
     addBootstrapJarAsResource,
     proguardedCli
   )
@@ -449,7 +456,7 @@ lazy val proguardedCli = Seq(
   javaOptions.in(Proguard, proguard) := Seq("-Xmx3172M"),
   artifactPath.in(Proguard) := proguardDirectory.in(Proguard).value / "coursier-standalone.jar",
   artifacts ++= {
-    if (scalaBinaryVersion.value == "2.11")
+    if (scalaBinaryVersion.value == "2.12")
       Seq(proguardedArtifact.value)
     else
       Nil