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.

Sign up for GitHub

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

Jump to bottom

Update scala to 2.13.7 and various build tweaks #5

Merged
merged 6 commits into from
Nov 19, 2021
Merged

Update scala to 2.13.7 and various build tweaks #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b3f38c
Add catsParseV
valencik Nov 19, 2021
84b80b2
Specify catsEffectV explicitly
valencik Nov 19, 2021
1f73d82
Remove commented out deps and format
valencik Nov 19, 2021
5189071
Update to sbt-davenverse 0.1.3
valencik Nov 19, 2021
9c7d551
Update to scala 2.13.7
valencik Nov 19, 2021
b11e8c1
Update github ci for scala 2.13.7
valencik Nov 19, 2021
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.14, 2.13.6]
scala: [2.12.14, 2.13.7]
java: [adopt@1.8, adopt@1.11]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -50,13 +50,13 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Setup Ruby
if: matrix.scala == '2.13.6'
if: matrix.scala == '2.13.7'
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.1

- name: Install microsite dependencies
if: matrix.scala == '2.13.6'
if: matrix.scala == '2.13.7'
run: |
gem install saas
gem install jekyll -v 4.2.0
Expand All @@ -66,7 +66,7 @@ jobs:

- run: sbt --client '++${{ matrix.scala }}; test; mimaReportBinaryIssues'

- if: matrix.scala == '2.13.6'
- if: matrix.scala == '2.13.7'
run: sbt --client '++${{ matrix.scala }}; site/makeMicrosite'

publish:
Expand All @@ -76,7 +76,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
scala: [2.13.7]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
Expand Down
23 changes: 8 additions & 15 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

val Scala213 = "2.13.6"
val Scala213 = "2.13.7"

ThisBuild / crossScalaVersions := Seq("2.12.14", Scala213)
ThisBuild / scalaVersion := Scala213

ThisBuild / testFrameworks += new TestFramework("munit.Framework")

val catsV = "2.6.1"
val catsEffectV = "3.2.9"
val catsParseV = "0.3.5"
val http4sV = "0.23.6"
val munitCatsEffectV = "1.0.6"

Expand All @@ -25,20 +27,11 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
name := "curly",

libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % catsV,
// "org.typelevel" %% "cats-effect" % catsEffectV,

// "co.fs2" %% "fs2-core" % fs2V,
// "co.fs2" %% "fs2-io" % fs2V,

"org.http4s" %%% "http4s-core" % http4sV,
"org.typelevel" %%% "cats-parse" % "0.3.5",
// "org.http4s" %% "http4s-ember-server" % http4sV,
// "org.http4s" %% "http4s-ember-client" % http4sV,
// "org.http4s" %% "http4s-circe" % http4sV,

"org.typelevel" %%% "munit-cats-effect-3" % munitCatsEffectV % Test,

"org.typelevel" %%% "cats-core" % catsV,
"org.typelevel" %%% "cats-effect" % catsEffectV,
"org.typelevel" %%% "cats-parse" % catsParseV,
"org.http4s" %%% "http4s-core" % http4sV,
"org.typelevel" %%% "munit-cats-effect-3" % munitCatsEffectV % Test,
)
).jsSettings(
scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)},
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
addSbtPlugin("io.chrisdavenport" % "sbt-davenverse" % "0.1.2")
addSbtPlugin("io.chrisdavenport" % "sbt-davenverse" % "0.1.3")