From ec861e22e5abb682461b3960bfe0d9ef488c69bf Mon Sep 17 00:00:00 2001 From: Derek Wooters Date: Mon, 27 Jan 2025 16:50:33 +0000 Subject: [PATCH 1/6] Bump scala and library versions --- build.sbt | 16 ++++++++-------- project/build.properties | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 project/build.properties diff --git a/build.sbt b/build.sbt index 22a7ea6..b647c7d 100644 --- a/build.sbt +++ b/build.sbt @@ -3,20 +3,20 @@ organization := "com.signalpath" version := "1.2" lazy val versions = new { - val scala212 = "2.12.11" - val scala213 = "2.13.10" + val scala212 = "2.12.20" + val scala213 = "2.13.15" val supportedScalaVersions = List(scala212, scala213) } crossScalaVersions := versions.supportedScalaVersions libraryDependencies ++= Seq( - "co.fs2" %% "fs2-core" % "2.5.6", - "com.github.alonsodomin.cron4s" %% "cron4s-core" % "0.6.1", - "eu.timepit" %% "fs2-cron-cron4s" % "0.5.0", - "org.typelevel" %% "cats-core" % "2.6.1", - "org.scalatest" %% "scalatest" % "3.1.2" % Test, - "org.scalamock" %% "scalamock" % "5.2.0" % Test, + "co.fs2" %% "fs2-core" % "3.11.0", + "com.github.alonsodomin.cron4s" %% "cron4s-core" % "0.7.0", // tied to fs2-cron-cron4s below + "eu.timepit" %% "fs2-cron-cron4s" % "0.9.0", + "org.typelevel" %% "cats-core" % "2.13.0", + "org.scalatest" %% "scalatest" % "3.2.19" % Test, + "org.scalamock" %% "scalamock" % "6.1.1" % Test, ) bintrayOrganization := Some("signalpath") diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 0000000..73df629 --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.10.7 From bc006e806a793a5fe1a98f7998aad4db5d73fda0 Mon Sep 17 00:00:00 2001 From: Derek Wooters Date: Mon, 27 Jan 2025 19:41:31 +0000 Subject: [PATCH 2/6] Update java version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89263ef..153766e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,6 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 21 - name: Run tests run: sbt test From abb51b8151c618ce998c0e51b5fff89a412f0232 Mon Sep 17 00:00:00 2001 From: Derek Wooters Date: Mon, 27 Jan 2025 19:42:08 +0000 Subject: [PATCH 3/6] Clarify the java step --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 153766e..8a9e377 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v1 with: java-version: 21 From 59dab9eba8c7fe71356407c09a19b0f2ef498747 Mon Sep 17 00:00:00 2001 From: Derek Wooters Date: Mon, 27 Jan 2025 19:45:33 +0000 Subject: [PATCH 4/6] Add sbt install to github action --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a9e377..1894ebf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,5 +15,11 @@ jobs: uses: actions/setup-java@v1 with: java-version: 21 + - name: Install sbt + run: | + echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list + curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x99E82A75642AC823" | sudo apt-key add + sudo apt-get update + sudo apt-get install sbt - name: Run tests run: sbt test From dba8b99cf4fa8d0dfe2724ca95e3b12d337e8226 Mon Sep 17 00:00:00 2001 From: Derek Wooters Date: Mon, 27 Jan 2025 19:49:45 +0000 Subject: [PATCH 5/6] Add sbt install to github action --- .github/workflows/ci.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1894ebf..f8e9803 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,16 +10,13 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 21 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: temurin java-version: 21 - - name: Install sbt - run: | - echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list - curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x99E82A75642AC823" | sudo apt-key add - sudo apt-get update - sudo apt-get install sbt + - name: Setup sbt launcher + uses: sbt/setup-sbt@v1 - name: Run tests run: sbt test From 9fa425e148067279225ea2dd502ed2d4128d5391 Mon Sep 17 00:00:00 2001 From: Derek Wooters Date: Mon, 27 Jan 2025 20:04:29 +0000 Subject: [PATCH 6/6] Downgrade libraries to stay in sync with old cats model --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index b647c7d..6890f02 100644 --- a/build.sbt +++ b/build.sbt @@ -11,9 +11,9 @@ lazy val versions = new { crossScalaVersions := versions.supportedScalaVersions libraryDependencies ++= Seq( - "co.fs2" %% "fs2-core" % "3.11.0", - "com.github.alonsodomin.cron4s" %% "cron4s-core" % "0.7.0", // tied to fs2-cron-cron4s below - "eu.timepit" %% "fs2-cron-cron4s" % "0.9.0", + "co.fs2" %% "fs2-core" % "2.5.10", + "com.github.alonsodomin.cron4s" %% "cron4s-core" % "0.6.1", // tied to fs2-cron-cron4s below + "eu.timepit" %% "fs2-cron-cron4s" % "0.5.0", // code needs to be reworked if we want to up these "org.typelevel" %% "cats-core" % "2.13.0", "org.scalatest" %% "scalatest" % "3.2.19" % Test, "org.scalamock" %% "scalamock" % "6.1.1" % Test,