Skip to content

Commit 26f6a0c

Browse files
authored
Merge pull request #1 from cquiroz/dep_updates_and_test_fix
Dependency updates and change repository
2 parents 43eb826 + 80731c0 commit 26f6a0c

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
## Scala Java-Time
33

4-
[![Build Status](https://travis-ci.org/soc/scala-java-time.svg?branch=master)](https://travis-ci.org/soc/scala-java-time)
5-
[![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)
4+
[![Build Status](https://travis-ci.org/cquiroz/scala-java-time.svg?branch=master)](https://travis-ci.org/cquiroz/scala-java-time)
5+
[![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)
66
[![Scala.js](http://scala-js.org/assets/badges/scalajs-0.6.8.svg)](http://scala-js.org)
77

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

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

56-
- `libraryDependencies += "io.github.soc" % "scala-java-time" % "2.0.0-M1"` (for Scala)
57-
- `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)
56+
- `libraryDependencies += "com.github.cquiroz" % "scala-java-time" % "2.0.0-M5"` (for Scala)
57+
- `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)
5858

5959
#### Building
6060
This project builds using sbt.
@@ -77,7 +77,7 @@ We are especially interested in contributions that tackle the following issues:
7777
- *Support for timezones:* The timezone information is read from a binary blob, which won't work in the browser.
7878
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.
7979

80-
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!
80+
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!
8181

8282
#### Plans
8383

@@ -107,3 +107,7 @@ Pull requests with later versions of the dat file will be accepted.
107107
No. This project is derived from the Reference Implementation previously hosted on GitHub.
108108
That project had a BSD license, which has been preserved here.
109109
Thus, this project is a fork of the original code before entry to OpenJDK.
110+
111+
##### What is the relation to [this](https://github.com/soc/scala-java-time/) project
112+
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

build.sbt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ val crossScalaVer = Seq(scalaVer, "2.10.6", "2.12.0")
88
lazy val commonSettings = Seq(
99
name := "scala-java-time",
1010
version := "2.0.0-M5",
11-
organization := "io.github.soc",
12-
homepage := Some(url("https://github.com/soc/scala-java-time")),
11+
organization := "com.github.cquiroz",
12+
homepage := Some(url("https://github.com/cquiroz/scala-java-time")),
1313
licenses := Seq("BSD 3-Clause License" -> url("https://opensource.org/licenses/BSD-3-Clause")),
1414

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

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

6868
lazy val pomData =
6969
<scm>
70-
<url>git@github.com:soc/scala-java-time.git</url>
71-
<connection>scm:git:git@github.com:soc/scala-java-time.git</connection>
70+
<url>git@github.com:cquiroz/scala-java-time.git</url>
71+
<connection>scm:git:git@github.com:cquiroz/scala-java-time.git</connection>
7272
</scm>
7373
<developers>
74+
<developer>
75+
<id>cquiroz</id>
76+
<name>Carlos Quiroz</name>
77+
<url>https://github.com/cquiroz</url>
78+
<roles>
79+
<role>Project Lead (current Scala version)</role>
80+
</roles>
81+
</developer>
7482
<developer>
7583
<id>soc</id>
7684
<name>Simon Ochsenreither</name>
7785
<url>https://github.com/soc</url>
7886
<roles>
79-
<role>Project Lead (current Scala version)</role>
87+
<role>Project Lead (original Scala version)</role>
8088
</roles>
8189
</developer>
8290
<developer>

jvm/src/test/scala/org/threeten/bp/UsabilityBasic.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import org.threeten.bp.temporal.TemporalField
4444

4545
/** Usability class for package. */
4646
class UsabilityBasic {
47-
@Test def main(): Unit = {
47+
def main(): Unit = {
4848
simpleCalendar()
4949
System.out.println("------")
5050
lookup()

0 commit comments

Comments
 (0)