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

Jump to bottom

upgrade to Scala 2.11 final #4

Merged
merged 31 commits into from
Apr 17, 2014
Merged

upgrade to Scala 2.11 final #4

merged 31 commits into from
Apr 17, 2014

Commits on May 29, 2013

  1. upgrade to Scala 2.11.0-M3

    @SethTisue
    SethTisue committed May 29, 2013
    Configuration menu
    Copy the full SHA
    e5c2f36 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2013

  1. Merge remote-tracking branch 'origin/master' into scala-2.11 

    Conflicts:
	build.sbt
    @SethTisue
    SethTisue committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    5106f21 View commit details
    Browse the repository at this point in the history

  2. upgrade to Scala 2.11.0-M4

    @SethTisue
    SethTisue committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    3adb012 View commit details
    Browse the repository at this point in the history

  3. upgrade to sbt 0.13.0-RC2 

    2.11.0-M4 seems to need sbt 0.13 in order for 'sbt console' to work
    @SethTisue
    SethTisue committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    b0dcf74 View commit details
    Browse the repository at this point in the history

  4. disable ENSIME until sbt 0.13 version is available

    @SethTisue
    SethTisue committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    0d2f64f View commit details
    Browse the repository at this point in the history

  5. disable optimize, it's too fragile in 2.11.0-M4

    @SethTisue
    SethTisue committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    8fce7b0 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2013

  1. Merge remote-tracking branch 'origin/sbt-0.13' into scala-2.11 

    Conflicts:
	project/build.properties
    @SethTisue
    SethTisue committed Jul 25, 2013
    Configuration menu
    Copy the full SHA
    5153e89 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2013

  1. use ScalaTest jar built for Scala 2.11.0-M4

    @SethTisue
    SethTisue committed Jul 26, 2013
    Configuration menu
    Copy the full SHA
    583f851 View commit details
    Browse the repository at this point in the history

  2. %% is smart enough to get the right ScalaTest

    @SethTisue
    SethTisue committed Jul 26, 2013
    Configuration menu
    Copy the full SHA
    487c261 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2013

  1. Merge branch 'sbt-0.13' into scala-2.11

    @SethTisue
    SethTisue committed Jul 30, 2013
    Configuration menu
    Copy the full SHA
    f774b58 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2013

  1. Merge branch 'sbt-0.13' into scala-2.11

    @SethTisue
    SethTisue committed Aug 12, 2013
    Configuration menu
    Copy the full SHA
    92e614c View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2013

  1. Merge branch 'master' into scala-2.11

    @SethTisue
    SethTisue committed Aug 26, 2013
    Configuration menu
    Copy the full SHA
    a6058d0 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2013

  1. Merge branch 'master' into scala-2.11

    @SethTisue
    SethTisue committed Aug 30, 2013
    Configuration menu
    Copy the full SHA
    52e8d49 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2013

  1. upgrade to Scala 2.11.0-M5 

    not upgrading ScalaTest yet since I doubt a new jar is available yet
    @SethTisue
    SethTisue committed Sep 8, 2013
    Configuration menu
    Copy the full SHA
    2b47a6d View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2013

  1. upgrade to Scala 2.11.0-M7

    @SethTisue
    SethTisue committed Nov 19, 2013
    Configuration menu
    Copy the full SHA
    88fbb3a View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2013

  1. ScalaTest is now available for Scala 2.11.0-M7

    @SethTisue
    SethTisue committed Nov 27, 2013
    Configuration menu
    Copy the full SHA
    ab6bf82 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2014

  1. Merge branch 'master' into scala-2.11 

    Conflicts:
	build.sbt
    @SethTisue
    SethTisue committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    3bf56c1 View commit details
    Browse the repository at this point in the history

  2. Pair has been deprecated

    @SethTisue
    SethTisue committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    2bef3fd View commit details
    Browse the repository at this point in the history

  3. upgrade to Scala 2.11.0-M8

    @SethTisue
    SethTisue committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    e8bae0b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'scalatest-2.1' into scala-2.11 

    Conflicts:
	build.sbt
    @SethTisue
    SethTisue committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    fe5f6e7 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2014

  1. use "extends AnyVal" whenever possible 

    including taking advantage of the new ability of the required
`val` to be `private`
    @SethTisue
    SethTisue committed Feb 13, 2014
    Configuration menu
    Copy the full SHA
    76cc0f1 View commit details
    Browse the repository at this point in the history

  2. use extends AnyVal in one more implicit class 

    working around the no-lazy-vals-allowed restriction
    @SethTisue
    SethTisue committed Feb 13, 2014
    Configuration menu
    Copy the full SHA
    389b180 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2014

  1. Merge branch 'master' into scala-2.11

    @SethTisue
    SethTisue committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    50cd79c View commit details
    Browse the repository at this point in the history

  2. upgrade to Scala 2.11.0-RC1

    @SethTisue
    SethTisue committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    c3ae572 View commit details
    Browse the repository at this point in the history

  3. update comment

    @SethTisue
    SethTisue committed Mar 18, 2014
    Configuration menu
    Copy the full SHA
    bb2a511 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2014

  1. Merge branch 'master' into scala-2.11

    @SethTisue
    SethTisue committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    1a51e6b View commit details
    Browse the repository at this point in the history

  2. upgrade to Scala 2.11.0-RC3 

    and upgrade ScalaTest since 2.1.2 is the only one that will run on
2.11.0-RC3
    @SethTisue
    SethTisue committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    f00d7d0 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2014

  1. upgrade to Scala 2.11.0-RC4 and ScalaTest 2.1.3

    @SethTisue
    SethTisue committed Apr 6, 2014
    Configuration menu
    Copy the full SHA
    28e246c View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2014

  1. Merge branch 'master' into scala-2.11 

    Conflicts:
	build.sbt
	sbt
    @SethTisue
    SethTisue committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    1253003 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sbt-0.13.2' into scala-2.11

    @SethTisue
    SethTisue committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    e7edba1 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2014

  1. upgrade to Scala 2.11 final 

    no ScalaTest build yet, ok to use RC4 build
    @SethTisue
    SethTisue committed Apr 17, 2014
    Configuration menu
    Copy the full SHA
    e3ce0d1 View commit details
    Browse the repository at this point in the history