Skip to content
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

2.11.x jdk8 #120

Merged
merged 4 commits into from
Jul 22, 2015
Merged

2.11.x jdk8 #120

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f97a447
JFrog finally pulled the plug on typesafe.artifactoryonline.com
SethTisue Jul 22, 2015
e08dedd
scala-swing 1.0.x doesn't support JDK 7, we need 2.0.x
SethTisue Jul 22, 2015
b539c9b
move to Play 2.4.x
SethTisue Jul 22, 2015
7507901
Merge remote-tracking branch 'origin/2.11.x-jdk8' into 2.11.x-jdk8
SethTisue Jul 22, 2015
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
7 changes: 3 additions & 4 deletions common.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ vars: {
// fixed sha from 2.10.x branch that has Scala 2.11 compatiblity patches merged
scala-io-ref : "adriaanm/scala-io.git#community-build"
json4s-ref : "json4s/json4s.git#v3.2.10_2.11"
// 2.4.x requires JDK 8, so here we stay on 2.3.x
playframework-ref : "playframework/playframework.git#2.3.x"
playframework-ref : "playframework/playframework.git#2.4.x"
// fixed sha from master that has Scala 2.11 patches merged
parboiled-ref : "sirthias/parboiled.git#c53e650212f222c9b1f75fa1ab13d7cab9db164e"
// This pull request supports the fully-cross-versioned continuations plugin, shipped with 2.11+
Expand Down Expand Up @@ -113,7 +112,7 @@ vars: {
scala-partest-interface-ref : "scala/scala-partest-interface.git"
scala-partest-ref : "scala/scala-partest.git"
scala-xml-ref : "scala/scala-xml.git"
scala-swing-ref : "scala/scala-swing.git#1.0.x"
scala-swing-ref : "scala/scala-swing.git#2.0.x"
scala-records-ref : "scala-records/scala-records.git"

// TODO move back to master after adding scalaz-stream to the community build.
Expand Down Expand Up @@ -147,7 +146,7 @@ options.resolvers: {
02: "maven-cache: https://scala-ci.typesafe.com/artifactory/central/"
03: "typesafe-ivy-releases: https://dl.bintray.com/typesafe/ivy-releases/, [organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly"
04: "sbt-plugin-releases: https://dl.bintray.com/sbt/sbt-plugin-releases/"${vars.ivyPat}
09: "dbuild-snapshots: http://typesafe.artifactoryonline.com/typesafe/temp-distributed-build-snapshots"${vars.ivyPat}
09: "dbuild-snapshots: http://dl.bintray.com/typesafe/temp-distributed-build-snapshots"${vars.ivyPat}
10: "maven-central"
11: "old-typesafe-maven-releases: https://dl.bintray.com/typesafe/maven-releases" // for play 2.3.9's netty-http-pipelining 1.1.2

Expand Down