Skip to content

Dependency updates and change repository #1

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.

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

Merged
merged 4 commits into from
Dec 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

## Scala Java-Time

[![Build Status](https://travis-ci.org/soc/scala-java-time.svg?branch=master)](https://travis-ci.org/soc/scala-java-time)
[![Maven Central](https://img.shields.io/maven-central/v/io.github.soc/scala-java-time_2.11.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.soc/scala-java-time_2.11)
[![Build Status](https://travis-ci.org/cquiroz/scala-java-time.svg?branch=master)](https://travis-ci.org/cquiroz/scala-java-time)
[![Maven Central](https://img.shields.io/maven-central/v/com.github.cquiroz/scala-java-time_2.11.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.cquiroz/scala-java-time_2.11)
[![Scala.js](http://scala-js.org/assets/badges/scalajs-0.6.8.svg)](http://scala-js.org)

This project provides an implementation of the `java.time` package, a date and time library that was added in Java 8.
Expand Down Expand Up @@ -53,8 +53,8 @@ Both Scala 2.11 and Scala 2.12 (2.12.0-M5 and later) are supported.

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

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

#### Building
This project builds using sbt.
Expand All @@ -77,7 +77,7 @@ We are especially interested in contributions that tackle the following issues:
- *Support for timezones:* The timezone information is read from a binary blob, which won't work in the browser.
We will have a look at other projects like moment.js and decide whether we want to use the same format, or come up with our own.

Have a look at the [issues](https://github.com/soc/scala-java-time/issues) to find something to work on! Let us know if you need help!
Have a look at the [issues](https://github.com/cquiroz/scala-java-time/issues) or [issues](https://github.com/soc/scala-java-time/issues) to find something to work on! Let us know if you need help!

#### Plans

Expand Down Expand Up @@ -107,3 +107,7 @@ Pull requests with later versions of the dat file will be accepted.
No. This project is derived from the Reference Implementation previously hosted on GitHub.
That project had a BSD license, which has been preserved here.
Thus, this project is a fork of the original code before entry to OpenJDK.

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

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
20 changes: 14 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ val crossScalaVer = Seq(scalaVer, "2.10.6", "2.12.0")
lazy val commonSettings = Seq(
name := "scala-java-time",
version := "2.0.0-M5",
organization := "io.github.soc",
homepage := Some(url("https://github.com/soc/scala-java-time")),
organization := "com.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")),

scalaVersion := scalaVer,
Expand Down Expand Up @@ -58,7 +58,7 @@ lazy val scalajavatime = crossProject.crossType(CrossType.Full).in(file("."))
TestNGPlugin.testNGSuites := Seq(((resourceDirectory in Test).value / "testng.xml").absolutePath)
).jsSettings(
libraryDependencies ++= Seq(
"com.github.cquiroz" %%% "scala-java-locales" % "0.3.1-cldr30"
"com.github.cquiroz" %%% "scala-java-locales" % "0.4.0-cldr30"
)
)

Expand All @@ -67,16 +67,24 @@ lazy val scalajavatimeJS = scalajavatime.js

lazy val pomData =
<scm>
<url>[email protected]:soc/scala-java-time.git</url>
<connection>scm:git:[email protected]:soc/scala-java-time.git</connection>
<url>[email protected]:cquiroz/scala-java-time.git</url>
<connection>scm:git:[email protected]:cquiroz/scala-java-time.git</connection>
</scm>
<developers>
<developer>
<id>cquiroz</id>
<name>Carlos Quiroz</name>
<url>https://github.com/cquiroz</url>
<roles>
<role>Project Lead (current Scala version)</role>
</roles>
</developer>
<developer>
<id>soc</id>
<name>Simon Ochsenreither</name>
<url>https://github.com/soc</url>
<roles>
<role>Project Lead (current Scala version)</role>
<role>Project Lead (original Scala version)</role>
</roles>
</developer>
<developer>
Expand Down
2 changes: 1 addition & 1 deletion jvm/src/test/scala/org/threeten/bp/UsabilityBasic.scala
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import org.threeten.bp.temporal.TemporalField

/** Usability class for package. */
class UsabilityBasic {
@Test def main(): Unit = {
def main(): Unit = {
simpleCalendar()
System.out.println("------")
lookup()
Expand Down