Skip to content
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

Unifies JS & JVM implementation of JSR-310 #60

Merged
merged 1 commit into from
Apr 9, 2017
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down

This file was deleted.

39 changes: 0 additions & 39 deletions core/shared/src/main/scala/cron4s/lib/threetenbp/package.scala

This file was deleted.

4 changes: 2 additions & 2 deletions docs/src/main/tut/docs/builtin_libs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff 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

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading