Unifies JS & JVM implementation of JSR-310

alonsodomin · alonsodomin · Apr 9, 2017 · Apr 9, 2017 · Apr 9, 2017 · 784f4413824b51125d47eb93bc3fccac84ec66c3
commit 784f4413824b51125d47eb93bc3fccac84ec66c3
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Cron4s
 
 [![Build Status](https://travis-ci.org/alonsodomin/cron4s.svg?branch=master)](https://travis-ci.org/alonsodomin/cron4s)
-[![Scala.js](http://scala-js.org/assets/badges/scalajs-0.6.13.svg)](http://scala-js.org)
+[![Scala.js](http://scala-js.org/assets/badges/scalajs-0.6.14.svg)](http://scala-js.org)
 [![License](http://img.shields.io/:license-Apache%202-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
 [![Latest version](https://index.scala-lang.org/alonsodomin/cron4s/cron4s/latest.svg?color=green)](https://index.scala-lang.org/alonsodomin/cron4s)
 

diff --git a/...s/lib/javatime/JavaTemporalInstance.scala → ...s/lib/javatime/JavaTemporalInstance.scala b/...s/lib/javatime/JavaTemporalInstance.scala → ...s/lib/javatime/JavaTemporalInstance.scala
@@ -16,10 +16,10 @@
 
 package cron4s.lib.javatime
 
-import java.time.temporal.{ChronoField, ChronoUnit, Temporal, TemporalField, TemporalUnit}
+import java.time.temporal._
 
-import cron4s.{CronField, CronUnit}
 import cron4s.datetime.IsDateTime
+import cron4s.{CronField, CronUnit}
 
 import scala.util.{Success, Try}
 

diff --git a/...n/scala/cron4s/lib/javatime/package.scala → ...n/scala/cron4s/lib/javatime/package.scala b/...n/scala/cron4s/lib/javatime/package.scala → ...n/scala/cron4s/lib/javatime/package.scala
diff --git a/core/shared/src/main/scala/cron4s/lib/threetenbp/JSR310Instance.scala b/core/shared/src/main/scala/cron4s/lib/threetenbp/JSR310Instance.scala
diff --git a/core/shared/src/main/scala/cron4s/lib/threetenbp/package.scala b/core/shared/src/main/scala/cron4s/lib/threetenbp/package.scala
diff --git a/docs/src/main/tut/docs/builtin_libs.md b/docs/src/main/tut/docs/builtin_libs.md
@@ -15,5 +15,5 @@ These are the libraries that are currently supported:
 ### ScalaJS
 
  * JavaScript `Date` API: Package `cron4s.lib.js`
- * JSR-310 Backport: Package `cron4s.lib.threetenbp`. _Support is provided via [scala-java-time](https://github.com/cquiroz/scala-java-time) 
- and requires declaring an explicit dependency in client code, which can also be used in the JVM._
+ * Java Time API: Package `cron4s.lib.javatime`. _Support is provided via [scala-java-time](https://github.com/cquiroz/scala-java-time) 
+ and requires declaring an explicit dependency in client code._
diff --git a/tests/shared/src/test/scala/cron4s/datetime/DateTimeCronSpec.scala b/tests/shared/src/test/scala/cron4s/datetime/DateTimeCronSpec.scala
@@ -16,12 +16,12 @@
 
 package cron4s.datetime
 
-import cron4s.lib.threetenbp._
-import cron4s.testkit.DateTimeCronTestKit
+import java.time.LocalDateTime
 
-import org.threeten.bp._
+import cron4s.lib.javatime._
+import cron4s.testkit.DateTimeCronTestKit
 
 /**
   * Created by alonsodomin on 29/01/2017.
   */
-class DateTimeCronSpec extends DateTimeCronTestKit[LocalDateTime] with ThreeTenBPLocalDateTimeTestBase
+class DateTimeCronSpec extends DateTimeCronTestKit[LocalDateTime] with JavaLocalDateTimeTestBase
diff --git a/tests/shared/src/test/scala/cron4s/datetime/DateTimeNodeSpec.scala b/tests/shared/src/test/scala/cron4s/datetime/DateTimeNodeSpec.scala
@@ -16,12 +16,12 @@
 
 package cron4s.datetime
 
-import cron4s.lib.threetenbp._
-import cron4s.testkit.DateTimeNodeTestKit
+import java.time.LocalDateTime
 
-import org.threeten.bp._
+import cron4s.lib.javatime._
+import cron4s.testkit.DateTimeNodeTestKit
 
 /**
   * Created by alonsodomin on 28/08/2016.
   */
-class DateTimeNodeSpec extends DateTimeNodeTestKit[LocalDateTime] with ThreeTenBPLocalDateTimeTestBase
+class DateTimeNodeSpec extends DateTimeNodeTestKit[LocalDateTime] with JavaLocalDateTimeTestBase
diff --git a/...ron4s/lib/javatime/JavaDateTimeSpec.scala → ...ron4s/lib/javatime/JavaDateTimeSpec.scala b/...ron4s/lib/javatime/JavaDateTimeSpec.scala → ...ron4s/lib/javatime/JavaDateTimeSpec.scala
diff --git a/...s/lib/javatime/JavaDateTimeTestBase.scala → ...s/lib/javatime/JavaDateTimeTestBase.scala b/...s/lib/javatime/JavaDateTimeTestBase.scala → ...s/lib/javatime/JavaDateTimeTestBase.scala
diff --git a/.../JavaTimeCronDateTimeRegressionSpec.scala → .../JavaTimeCronDateTimeRegressionSpec.scala b/.../JavaTimeCronDateTimeRegressionSpec.scala → .../JavaTimeCronDateTimeRegressionSpec.scala
@@ -20,7 +20,6 @@ import java.time.LocalDateTime
 import java.time.temporal.{ChronoField, ChronoUnit}
 
 import cron4s._
-
 import org.scalatest.{FlatSpec, Matchers}
 
 /**

diff --git a/...b/javatime/JavaTimeCronDateTimeSpec.scala → ...b/javatime/JavaTimeCronDateTimeSpec.scala b/...b/javatime/JavaTimeCronDateTimeSpec.scala → ...b/javatime/JavaTimeCronDateTimeSpec.scala
diff --git a/...b/javatime/JavaTimeDateTimeCronSpec.scala → ...b/javatime/JavaTimeDateTimeCronSpec.scala b/...b/javatime/JavaTimeDateTimeCronSpec.scala → ...b/javatime/JavaTimeDateTimeCronSpec.scala
diff --git a/tests/shared/src/test/scala/cron4s/lib/threetenbp/ThreeTenBPCronDateTimeRegressionSpec.scala b/tests/shared/src/test/scala/cron4s/lib/threetenbp/ThreeTenBPCronDateTimeRegressionSpec.scala
diff --git a/tests/shared/src/test/scala/cron4s/lib/threetenbp/ThreeTenBPCronDateTimeSpec.scala b/tests/shared/src/test/scala/cron4s/lib/threetenbp/ThreeTenBPCronDateTimeSpec.scala
diff --git a/tests/shared/src/test/scala/cron4s/lib/threetenbp/ThreeTenBPDateTimeCronSpec.scala b/tests/shared/src/test/scala/cron4s/lib/threetenbp/ThreeTenBPDateTimeCronSpec.scala
diff --git a/tests/shared/src/test/scala/cron4s/lib/threetenbp/ThreeTenBPDateTimeSpec.scala b/tests/shared/src/test/scala/cron4s/lib/threetenbp/ThreeTenBPDateTimeSpec.scala
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,6 @@ import java.time.LocalDateTime @@
     import java.time.temporal.{ChronoField, ChronoUnit}
     import cron4s._
     import org.scalatest.{FlatSpec, Matchers}
     /**
@@ Expand Down @@