Skip to content

Commit

Permalink
Merge branch 'master' into update/scala-library-2.13.16
Browse files Browse the repository at this point in the history
  • Loading branch information
alonsodomin authored Jan 24, 2025
2 parents b7adfcb + 23d1e3e commit b5547f2
Show file tree
Hide file tree
Showing 27 changed files with 939 additions and 358 deletions.
6 changes: 6 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ f38f22000feccc04e12763fd70118293397715a6

# Scala Steward: Reformat with scalafmt 3.8.3
d5a70b77bf5c23f294499c11f00bfa500576a78c

# Scala Steward: Reformat with scalafmt 3.8.4
739f0f972a39d309c04633c298167d60f38131b7

# Scala Steward: Reformat with scalafmt 3.8.5
e16977a3f50e4da86db96a3af3fa567e5a480a73
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.5

docstrings.style = SpaceAsterisk
runner.dialect = Scala213
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Cron4s Change Log

## 0.8.0

Breaking changes:

* In previous versions, Cron expression parsing was using [Scala Parser Combinators](https://github.com/scala/scala-parser-combinators).
Parsing is now achieved using [Atto library](https://tpolecat.github.io/atto/) by default on all targets except Native.
Both parsers should behave the same way and the API didn't change. They will be kept in sync for the time being.
In case you notice any change in behavior, please open an issue with your input.
You can always fall back to the Parser Combinator version by adding `cron4s-parserc` as a dependency of your project and
use `Cron.withParser(cron4s.parsing.Parser)` instead of `Cron` instance.

## 0.6.1

Bug fixes
Expand Down
194 changes: 0 additions & 194 deletions bench/src/main/scala/cron4s/atto/package.scala

This file was deleted.

9 changes: 5 additions & 4 deletions bench/src/main/scala/cron4s/bench/ParserBenchmark.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
package cron4s.bench

import java.util.concurrent.TimeUnit

import cron4s._

import org.openjdk.jmh.annotations._

import scala.annotation.nowarn

@State(Scope.Thread)
@BenchmarkMode(Array(Mode.AverageTime))
@OutputTimeUnit(TimeUnit.MICROSECONDS)
Expand All @@ -37,9 +37,10 @@ class ParserBenchmark {
)
var cronString: String = _

@nowarn("cat=deprecation")
@Benchmark
def parserCombinators() = parsing.parse(cronString)
def parserCombinators() = parsing.Parser.parse(cronString)

@Benchmark
def attoParser() = atto.parse(cronString)
def attoParser() = atto.Parser.parse(cronString)
}
Loading

0 comments on commit b5547f2

Please sign in to comment.