Skip to content
This repository was archived by the owner on Jun 23, 2020. It is now read-only.

Commit 4b5cfd5

Browse files
authored
Merge pull request #19 from danslapman/master
Update scala to 2.12.0-RC1
2 parents bc61535 + b331bfe commit 4b5cfd5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ lazy val commonSettings = scalaModuleSettings ++ Seq(
99
organization := "org.scala-lang.plugins",
1010
version := "1.0.3-SNAPSHOT",
1111
scalaVersion := "2.11.8",
12-
crossScalaVersions := Seq("2.11.8", "2.12.0-M5"),
12+
crossScalaVersions := Seq("2.11.8", "2.12.0-RC1"),
1313
snapshotScalaBinaryVersion := "2.11.8",
1414
scalacOptions ++= Seq(
1515
"-deprecation",

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.11
1+
sbt.version=0.13.12

project/release_on_tag.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# if the current commit has a tag named like v(\d+\.\d+\.\d+.*),
44
# and we're running on the right jdk/branch,
55
# echo the sbt commands that publish a release with the version derived from the tag
6-
publishJdk=openjdk6
6+
publishJdk=oraclejdk8
77
publishBranch=master
8-
publishScalaVersion=2.11.0-M7
8+
publishScalaVersion=2.12.0-RC1
99

1010
unset tag version
1111

0 commit comments

Comments
 (0)