This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/project/Sbt.scala b/project/Sbt.scala | |
index 4e660f4..8007c3b 100644 | |
--- a/project/Sbt.scala | |
+++ b/project/Sbt.scala | |
@@ -8,6 +8,8 @@ import Common._ | |
import Licensed._ | |
import Scope.ThisScope | |
import LaunchProguard.{ proguard, Proguard } | |
+import com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys | |
+import com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseCreateSrc |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Greks-MBP:uber-build grek (test/new-zinc-script2)$ git diff | |
diff --git a/config/nightly-4.0.x-juno-2.11.conf b/config/nightly-4.0.x-juno-2.11.conf | |
index 27de8cd..f115399 100644 | |
--- a/config/nightly-4.0.x-juno-2.11.conf | |
+++ b/config/nightly-4.0.x-juno-2.11.conf | |
@@ -37,12 +37,12 @@ BUILD_TYPE=dev | |
##### Scala information ##### | |
SCALA_GIT_REPO=git://github.com/scala/scala | |
# The version of Scala to use | |
-SCALA_VERSION=2.11.0-SNAPSHOT |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[info] ---------------------- | |
[info] Processing subproject: spray-routing | |
[info] All Dependencies for subproject spray-routing: | |
[info] org.scala-lang:scala-compiler:2.11.0-dbuildx7e11954059424344551f607665953d6f57e4ce29:scala-tool->default,optional(default) | |
[info] org.scala-lang:scala-library:2.11.0-dbuildx7e11954059424344551f607665953d6f57e4ce29:scala-tool->default,optional(default) | |
[info] io.spray:spray-caching:1.3.1:provided | |
[info] io.spray:spray-can:1.3.1:provided | |
[info] io.spray:spray-http:1.3.1 | |
[info] io.spray:spray-httpx:1.3.1 | |
[info] io.spray:spray-util:1.3.1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
def grouped[T](xs: Seq[T], n: Int): Iterator[Seq[T]] = { | |
val (segment, rest) = xs.splitAt(n) | |
Iterator(segment) ++ (if (rest.isEmpty) Iterator.empty else grouped(rest, n)) | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[info] --== Building tortoise ==-- | |
[info] Resolving: https://github.com/NetLogo/Tortoise.git#c0b92fd5500946ee81bb4218068698fe2b62d4bf in directory: ./target-0.8.0/project-builds/tortoise-f6e3461402cc7350ea86ba6fd87be1e2ba02ff48 | |
[info] Fetching https://github.com/NetLogo/Tortoise.git | |
[info] into /Users/grek/scala/community-builds/target-0.8.0/clones/acb9ca061501f3080d5a5e4d2c2c10fe80b6625c | |
[info] Took: 00h 00m 01.1s | |
[info] Fetching /Users/grek/scala/community-builds/target-0.8.0/clones/acb9ca061501f3080d5a5e4d2c2c10fe80b6625c | |
[info] into /Users/grek/scala/community-builds/target-0.8.0/project-builds/tortoise-f6e3461402cc7350ea86ba6fd87be1e2ba02ff48 | |
[info] Took: 00h 00m 00.0s | |
[info] Removing .dbuild.ivy.quiet.sbt | |
[info] Removing .dbuild/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[repositories] | |
local | |
remote-repos: http://localhost:8081/artifactory/remote-repos/ | |
remote-repos-ivy: http://localhost:8081/artifactory/remote-repos-ivy/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] | |
# maven-central | |
# sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots | |
# sonatype-releases: https://oss.sonatype.org/content/repositories/releases | |
# java-annoying-cla-shtuff: http://download.java.net/maven/2/ | |
# typesafe-releases: http://typesafe.artifactoryonline.com/typesafe/releases | |
# typesafe-ivy-releases: http://typesafe.artifactoryonline.com/typesafe/ivy-releases, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. Run `publish-local` for sbinary from 5af79a0f833d2f0ccf8cc791c2f15f984fb80cc8 (latest master) with sbinary.patch applied. | |
2. Got to sbt checkout of 0.13 branch (4ab8074753695665300b692a4fee26635b1ed118) and apply sbt.patch | |
3. In sbt console `++ 2.11.0-M8`; compile |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# | |
# A fatal error has been detected by the Java Runtime Environment: | |
# | |
# SIGSEGV (0xb) at pc=0x000000010ff99024, pid=21513, tid=20739 | |
# | |
# JRE version: Java(TM) SE Runtime Environment (8.0-b123) (build 1.8.0-ea-b123) | |
# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.0-b65 mixed mode bsd-amd64 compressed oops) | |
# Problematic frame: | |
# V [libjvm.dylib+0x399024] | |
# |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Grzegorzs-MacBook-Pro:scala-master grek (java8-support)$ ant test.suite | |
Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=192M; support was removed in 8.0 | |
CompilerOracle: exclude scala/tools/nsc/transform/patmat/PatternMatching.AnalysisBudget | |
Buildfile: /Users/grek/scala/scala-master/build.xml | |
desired.jars.uptodate: | |
boot: | |
init.git: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- /Users/grek/scala/scalaz/core/src/main/scala/scalaz/Kleisli.scala | |
+++ /Users/grek/scala/scalaz/core/src/main/scala/scalaz/Kleisli.scala | |
@@ -1059,11 +1059,11 @@ | |
^inherited^ def point[ scalaz.KleisliApplicative.A >: scala.this#Nothing <: scala.this#Any](a: => <scalaz.KleisliApplicative.A>): scalaz.this#Kleisli[<scalaz.KleisliMonad.F>, <scalaz.KleisliMonad.R>, <scalaz.KleisliApplicative.A>] | |
implicit abstract def F: scalaz.this#Monad[<scalaz.KleisliMonad.F>] | |
def $init$(): scala.this#Unit | |
def bind[ scalaz.KleisliMonad.A >: scala.this#Nothing <: scala.this#Any, scalaz.KleisliMonad.B >: scala.this#Nothing <: scala.this#Any](fa: scalaz.this#Kleisli[<scalaz.KleisliMonad.F>, <scalaz.KleisliMonad.R>, <scalaz.KleisliMonad.A>])(f: scala.this#Function1[<scalaz.KleisliMonad.A>, scalaz.this#Kleisli[<scalaz.KleisliMonad.F>, <scalaz.KleisliMonad.R>, <scalaz.KleisliMonad.B>]]): scalaz.this#Kleisli[<scalaz.KleisliMonad.F>, <scalaz.KleisliMonad.R>, <scalaz.KleisliMonad.B>] | |
} | |
-private abstract trait scalaz.KleisliMonadRea |