Skip to content

Commit

Permalink
Merge pull request #58 from cquiroz/release-2.0.0-M11
Browse files Browse the repository at this point in the history
Release 2.0.0-M11
  • Loading branch information
cquiroz authored May 12, 2017
2 parents 47a2ce8 + dccbe6a commit 8a11624
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Both Scala 2.11 and Scala 2.12 (2.12.0-M7 and later) are supported.

To get started with SBT, add one (or both) of these dependencies:

- `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M10"` (for Scala)
- `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-M10` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required)
- `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M11"` (for Scala)
- `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-M11` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required)

#### Documentation

Expand Down
4 changes: 0 additions & 4 deletions RELEASE-NOTES.md

This file was deleted.

5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ lazy val downloadFromZip: TaskKey[Unit] =
lazy val commonSettings = Seq(
name := "scala-java-time",
description := "java.time API implementation in Scala and Scala.js",
version := "2.0.0-M10",
version := "2.0.0-M11",
organization := "io.github.cquiroz",
homepage := Some(url("https://github.com/cquiroz/scala-java-time")),
licenses := Seq("BSD 3-Clause License" -> url("https://opensource.org/licenses/BSD-3-Clause")),
Expand Down Expand Up @@ -61,11 +61,12 @@ lazy val root = project.in(file("."))
.aggregate(scalajavatimeJVM, scalajavatimeJS)
.settings(commonSettings: _*)
.settings(
name := "scalajavatime",
name := "scala-java-time",
// No, SBT, we don't want any artifacts for root.
// No, not even an empty jar.
publish := {},
publishLocal := {},
publishArtifact := false,
Keys.`package` := file(""))

lazy val tzDbSettings = Seq(
Expand Down
9 changes: 3 additions & 6 deletions docs/src/main/tut/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ Both Scala 2.11 and Scala 2.12 (2.12.0-M8 and later) are supported.

To get started with SBT, add one (or both) of these dependencies:

- `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M10"` (for Scala)
- `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-M10"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required)
- `libraryDependencies += "io.github.cquiroz" %% "scala-java-time" % "2.0.0-M11"` (for Scala)
- `libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0-M11"` (for Scala.js, [Scala.js plugin](http://www.scala-js.org/tutorial/basic/#sbt-setup) required)

#### Building
This project builds using sbt.
Expand All @@ -70,14 +70,13 @@ Run `sbt scalajavatimeCrossJVM/test` to run the test suite on the JVM and

#### Status

Most parts of this library work perfectly fine with Scala.js in the browser.
All parts of this library work perfectly fine with Scala.js in the browser.

#### Contributing

We welcome all contributions, including ideas, suggestions, bug reports, bug fixes and code!
We are especially interested in contributions that tackle the following issues:

* Complete the port of tests to scalatest
* Modularize the tzdb database
* Find ways to reduce the size of the library

Expand All @@ -87,8 +86,6 @@ Have a look at the [issues](https://github.com/cquiroz/scala-java-time/issues) o

##### 2.0

We will keep releasing milestone builds while work on the remaining bits and pieces to support 100% of this library on Scala.js is ongoing (most parts work fine already).

The current version is published containing the code in both packages: `org.threeten.bp` and `java.time`.

A stable release of 2.0 will be published after a (hopefully) short RC phase.
Expand Down

0 comments on commit 8a11624

Please sign in to comment.