Skip to content

Commit 0459372

Browse files
cquirozcquiroz
authored
Merge pull request #14 from cquiroz/release-M7
Prepare release 2.0.0-M7
2 parents 8c6856a + 7f79a6c commit 0459372

File tree

4 files changed

+33
-10
lines changed

4 files changed

+33
-10
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ The implementation is based on the original BSD-licensed reference implementatio
1111
#### Usage
1212

1313
The *scala-java-time* library is currently available for Scala (JVM, version 8 and later) and Scala.js (JavaScript).
14-
Both Scala 2.11 and Scala 2.12 (2.12.0-M6 and later) are supported.
14+
Both Scala 2.11 and Scala 2.12 (2.12.0-M7 and later) are supported.
1515

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

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

2121
#### Documentation
2222

‎build.sbt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,22 @@ val crossScalaVer = Seq(scalaVer, "2.10.6", "2.12.0")
1010
lazy val commonSettings = Seq(
1111
name := "scala-java-time",
1212
description := "java.time API implementation in Scala and Scala.js",
13-
version := "2.0.0-M6",
13+
version := "2.0.0-M7",
1414
organization := "io.github.cquiroz",
1515
homepage := Some(url("https://github.com/cquiroz/scala-java-time")),
1616
licenses := Seq("BSD 3-Clause License" -> url("https://opensource.org/licenses/BSD-3-Clause")),
1717

1818
scalaVersion := scalaVer,
1919
crossScalaVersions := crossScalaVer,
20+
autoAPIMappings := true,
21+
22+
scalacOptions in Compile ++= Seq(
23+
"-deprecation",
24+
"-feature",
25+
// Enable when documentation does not produce warnings
26+
//"-Xfatal-warnings",
27+
"-encoding", "UTF-8"
28+
),
2029

2130
publishArtifact in Test := false,
2231
publishMavenStyle := true,
@@ -104,7 +113,7 @@ lazy val scalajavatime = crossProject.crossType(CrossType.Full).in(file("."))
104113
}.taskValue,
105114
parallelExecution in Test := false,
106115
libraryDependencies ++= Seq(
107-
"io.github.cquiroz" %%% "scala-java-locales" % "0.5.0-cldr30"
116+
"com.github.cquiroz" %%% "scala-java-locales" % "0.3.1-cldr30"
108117
)
109118
)
110119

‎changes.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,19 @@
88
</properties>
99
<body>
1010
<!-- types are add, fix, remove, update -->
11+
<release version="2.0.0-M7" date="2017-01-16" description="v2.0.0-M7">
12+
<action dev="cquiroz" type="update" >
13+
Downgrade to scala-java-locales 0.3.1-cldr30 to reduce the exported js size
14+
</action>
15+
</release>
16+
<release version="2.0.0-M6" date="2016-12-08" description="v2.0.0-M6">
17+
<action dev="cquiroz" type="update" >
18+
Exports in both org.threeten.bp and java.time packages
19+
</action>
20+
<action dev="cquiroz" type="update" >
21+
Published under a new organization
22+
</action>
23+
</release>
1124
<release version="2.0.0-M5" date="2016-11-08" description="v2.0.0-M5">
1225
<action dev="cquiroz" type="fix" >
1326
Fix #47: Test failures on TestDateTimeFormatters on Scala 2.12

‎docs/src/main/tut/index.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ The implementation is based on the original BSD-licensed reference implementatio
1717

1818
```tut:book
1919
// You can pick either java.time or org.threeten.bp package to import
20-
import java.time._
20+
//import java.time._
21+
import org.threeten.bp._
2122
2223
// always returns 2009-02-13T23:31:30
2324
val fixedClock = Clock.fixed(Instant.ofEpochSecond(1234567890L), ZoneOffset.ofHours(0))
@@ -55,12 +56,12 @@ chrono.MinguoDate.now(fixedClock).toString == "Minguo ROC 98-02-13"
5556
#### Usage
5657

5758
The *scala-java-time* library is currently available for Scala (JVM, version 8 and later) and Scala.js (JavaScript).
58-
Both Scala 2.11 and Scala 2.12 (2.12.0-M6 and later) are supported.
59+
Both Scala 2.11 and Scala 2.12 (2.12.0-M7 and later) are supported.
5960

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

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

6566
#### Building
6667
This project builds using sbt.
@@ -109,4 +110,4 @@ Thus, this project is a fork of the original code before entry to OpenJDK.
109110

110111
##### What is the relation to [this](https://github.com/soc/scala-java-time/) project
111112

112-
This is a fork from the original [project](https://github.com/soc/scala-java-time/) aim to complete the API to work on Scala.js
113+
This is a fork from the original [project](https://github.com/soc/scala-java-time/) aim to complete the API to work on Scala.js

0 commit comments

Comments
 (0)