From 2faa8f1a75d6b912dbcbf33463b530ad81cc634d Mon Sep 17 00:00:00 2001 From: Antonio Gelameris Date: Mon, 8 Apr 2024 23:40:28 +0200 Subject: [PATCH] Fix build --- .github/workflows/ci.yml | 2 +- build.sbt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4763ebd..680ce02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.19] + scala: [2.12] java: [temurin@11] runs-on: ${{ matrix.os }} timeout-minutes: 60 diff --git a/build.sbt b/build.sbt index fa8f8fd..7fb4e03 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,5 @@ lazy val root = (project in file(".")).settings( name := "base.g8", - scalaVersion := "2.12.19", - Test / test := { val _ = (Test / g8Test).toTask("").value }, scriptedLaunchOpts ++= List( "-Xms1024m", "-Xmx1024m", @@ -9,10 +7,10 @@ lazy val root = (project in file(".")).settings( "-Xss2m", "-Dfile.encoding=UTF-8" ), - ThisBuild / githubWorkflowPublishTargetBranches := Seq(), - ThisBuild / githubWorkflowScalaVersions := Seq("2.12.19"), + ThisBuild / githubWorkflowPublishTargetBranches := Nil, + ThisBuild / githubWorkflowScalaVersions := List("2.12"), ThisBuild / githubWorkflowBuild := - Seq(WorkflowStep.Sbt(List("g8Test"), name = Some("Testing template"))), + List(WorkflowStep.Sbt(List("g8Test"), name = Some("Testing template"))), // These are here for scala-steward libraryDependencies ++= Seq( "org.typelevel" %% "cats-core" % "2.10.0", @@ -20,6 +18,8 @@ lazy val root = (project in file(".")).settings( "co.fs2" %% "fs2-io" % "3.10.2", "com.monovore" %% "decline-effect" % "2.4.1", "com.disneystreaming" %% "weaver-cats" % "0.8.4", - "com.disneystreaming" %% "weaver-scalacheck" % "0.8.4" + "com.disneystreaming" %% "weaver-scalacheck" % "0.8.4", + "org.scala-lang" % "scala-library" % "2.13.13", + "org.scala-lang" % "scala3-library_3" % "3.3.3" ) )