Merge pull request #162 from joriscode/backport

chore!: Update versions

Author: nrinaudo

.github/workflows/cli.yml

@@ -1,31 +1,44 @@
 name: CI
 on:
+  workflow_dispatch:
   push:
-    branches: [master]
   pull_request:
-    branches: [master]
 
 jobs:
+  pre_job:
+    name: Skip Duplicate Actions
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          skip_after_successful_duplicate: 'true'
+
   test:
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
     strategy:
       fail-fast: false
       matrix:
         os   :    [ubuntu-latest]
-        scala:    [2.12.15, 2.13.6]
+        scala:    [2.12.20, 2.13.16]
         platform: [jvm, js]
-        java :    [8, 11]
+        java :    [8, 21]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup
-        uses: olafurpg/setup-scala@v13
+        uses: coursier/setup-action@v1
         with:
-          java-version: "adopt@1.${{ matrix.java }}"
+          jvm: "temurin:${{ matrix.java }}"
+          apps: sbt
 
       - name: Cache
-        uses: coursier/cache-action@v5
+        uses: coursier/cache-action@v6
 
       - name: Test JVM
         if: matrix.platform == 'jvm'

.gitignore

@@ -1,36 +1,15 @@
-*.class
-*.log
-
-# sbt specific
-.cache/
-.history/
-.lib/
-dist/*
-target/
-lib_managed/
-src_managed/
-project/boot/
-project/plugins/project/
-.bsp
-
-# Scala-IDE specific
-.scala_dependencies
-.worksheet
+# IDE and other personal preferences go to a global gitignore or .git/info/exclude
 
-# Misc. analysis tools
-.ensime
-.ensime_cache
+# Scala ecosystem
 .bloop
+.bsp
 .metals
+project/boot/
+project/plugins/project/
+target/
 
-# Intellij
-.idea/
-*.iml
-*.iws
-
-# Mac
-.DS_Store
-
-# Auto-generated files
+# Project
+## generated files
+.scalafix.conf
 .scalafmt.conf
-scalastyle-config.xml
+*.log

.jvmopts

@@ -4,11 +4,6 @@
 -Dfile.encoding=UTF8
 -Xms1G
 -Xmx13G
--XX:MaxPermSize=512M
 -XX:ReservedCodeCacheSize=250M
 -XX:+TieredCompilation
 -XX:-UseGCOverheadLimit
-# effectively adds GC to Perm space
--XX:+CMSClassUnloadingEnabled
-# must be enabled for CMSClassUnloadingEnabled to work
--XX:+UseConcMarkSweepGC

README.md

@@ -1,7 +1,8 @@
 # kantan.regex
 
-[![Build Status](https://travis-ci.org/nrinaudo/kantan.regex.svg?branch=master)](https://travis-ci.org/nrinaudo/kantan.regex)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.nrinaudo/kantan.regex_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.nrinaudo/kantan.regex_2.13)
+[![Build Status](https://github.com/nrinaudo/kantan.regex/actions/workflows/cli.yml/badge.svg?branch=master)](https://github.com/nrinaudo/kantan.regex/actions/workflows/cli.yml?branch=master)
+[![kantan.regex Scala version support](https://index.scala-lang.org/nrinaudo/kantan.regex/kantan.regex/latest-by-scala-version.svg?platform=jvm)](https://index.scala-lang.org/nrinaudo/kantan.regex/kantan.regex)
+[![kantan.regex Scala version support](https://index.scala-lang.org/nrinaudo/kantan.regex/kantan.regex/latest-by-scala-version.svg?platform=sjs1)](https://index.scala-lang.org/nrinaudo/kantan.regex/kantan.regex)
 [![Join the chat at https://gitter.im/nrinaudo/kantan.regex](https://img.shields.io/badge/gitter-join%20chat-52c435.svg)](https://gitter.im/nrinaudo/kantan.regex)
 
 There are two main use-cases for regular expressions:

cats/shared/src/main/scala/kantan/regex/cats/package.scala

@@ -16,15 +16,18 @@
 
 package kantan.regex
 
-import _root_.cats.{Eq, Functor}
-import kantan.codecs.cats.{CommonInstances, DecoderInstances}
+import _root_.cats.Eq
+import _root_.cats.Functor
+import kantan.codecs.cats.CommonInstances
+import kantan.codecs.cats.DecoderInstances
 
 package object cats extends DecoderInstances with CommonInstances {
   // - Regex instances -------------------------------------------------------------------------------------------------
   // -------------------------------------------------------------------------------------------------------------------
 
   implicit val regexFunctor: Functor[Regex] = new Functor[Regex] {
-    override def map[A, B](fa: Regex[A])(f: A => B) = fa.map(f)
+    override def map[A, B](fa: Regex[A])(f: A => B) =
+      fa.map(f)
   }
 
   // - Eq instances ----------------------------------------------------------------------------------------------------

cats/shared/src/test/scala/kantan/regex/cats/DecoderTests.scala

@@ -19,9 +19,11 @@ package kantan.regex.cats
 import cats.Eq
 import cats.data.EitherT
 import cats.instances.all._
-import cats.laws.discipline.{MonadErrorTests, SemigroupKTests}
+import cats.laws.discipline.MonadErrorTests
+import cats.laws.discipline.SemigroupKTests
 import cats.laws.discipline.SemigroupalTests.Isomorphisms
-import kantan.regex.{DecodeError, GroupDecoder}
+import kantan.regex.DecodeError
+import kantan.regex.GroupDecoder
 import kantan.regex.cats.arbitrary._
 import kantan.regex.cats.equality._
 import kantan.regex.laws.discipline.DisciplineSuite

cats/shared/src/test/scala/kantan/regex/cats/ErrorTests.scala

@@ -18,7 +18,9 @@ package kantan.regex.cats
 
 import cats.Show
 import cats.kernel.laws.discipline.EqTests
-import kantan.regex.{CompileError, DecodeError, RegexError}
+import kantan.regex.CompileError
+import kantan.regex.DecodeError
+import kantan.regex.RegexError
 import kantan.regex.cats.arbitrary._
 import kantan.regex.laws.discipline.DisciplineSuite
 

cats/shared/src/test/scala/kantan/regex/cats/equality.scala

@@ -22,8 +22,9 @@ import kantan.regex.Regex
 
 object equality extends kantan.codecs.cats.laws.discipline.EqInstances {
 
-  implicit def eqRegex[A: Eq]: Eq[Regex[A]] = Eq.by { regex => (str: String) =>
-    regex.eval(str).toList
-  }
+  implicit def eqRegex[A: Eq]: Eq[Regex[A]] =
+    Eq.by { regex => (str: String) =>
+      regex.eval(str).toList
+    }
 
 }

core/jvm/src/main/scala/kantan/regex/PlatformSpecificInstances.scala

@@ -16,10 +16,12 @@
 
 package kantan.regex
 
+import kantan.codecs.strings.StringDecoder
+
 import java.text.DateFormat
 import java.util.Date
-import kantan.codecs.strings.StringDecoder
 
 trait PlatformSpecificInstances {
-  def dateDecoder(format: DateFormat): GroupDecoder[Date] = codecs.fromString(StringDecoder.dateDecoder(format))
+  def dateDecoder(format: DateFormat): GroupDecoder[Date] =
+    codecs.fromString(StringDecoder.dateDecoder(format))
 }

core/jvm/src/test/scala/kantan/regex/DateDecoderTests.scala

@@ -18,7 +18,7 @@ package kantan.regex
 
 import java.text.SimpleDateFormat
 import java.util.{Date, Locale}
-import kantan.codecs.strings.{StringCodec}
+import kantan.codecs.strings.StringCodec
 import kantan.regex.laws.discipline.{DisciplineSuite, GroupDecoderTests, MatchDecoderTests}
 import kantan.regex.laws.discipline.arbitrary._