Skip to content

Update project to use scala 2.12 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+15 −8
Closed

Update project to use scala 2.12 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,21 @@ organization := "org.scalaj"

version := "0.8"

crossScalaVersions := Seq("2.10.5", "2.11.7")
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1")

scalacOptions <++= scalaVersion map { (v: String) =>
javacOptions ++= Seq("-source", "1.7", "-target", "1.7")

scalacOptions ++= {
Seq("-deprecation", "-unchecked", "-feature", "-language:implicitConversions", "-language:higherKinds")
}

scalacOptions ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 12)) => Seq()
case _ => Seq("-target:jvm-1.7")
}
}

libraryDependencies ++= Seq(
"joda-time" % "joda-time" % "2.2",
"org.joda" % "joda-convert" % "1.2"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
8 changes: 3 additions & 5 deletions sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
#!/bin/sh

VERSION=0.13.6
LATEST=http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${VERSION}/sbt-launch.jar
VERSION=0.13.13
LATEST=http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${VERSION}/sbt-launch.jar
JAR=.sbtlib/sbt-launch-${VERSION}.jar

if [ ! -d .sbtlib ]; then
mkdir .sbtlib
fi



if [ ! -f ${JAR} ]; then
rm .sbtlib/*
echo "Fetching sbt"
curl --progress-bar ${LATEST} > ${JAR}
curl -# -L "${LATEST}" -o "${JAR}"
fi

java \
Expand Down