Skip to content

Commit

Permalink
Drop support for Scala 2.11 and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ruippeixotog committed Apr 28, 2021
1 parent cbe1401 commit 8054c7d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -8,8 +8,8 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [openjdk@1.11.0]
scala: [2.11.12, 2.12.11, 2.13.2]
jdk: [adopt@1.8]
scala: [2.12.13, 2.13.5]

steps:
- name: Checkout repository
Expand Down
18 changes: 16 additions & 2 deletions .gitignore
@@ -1,4 +1,18 @@
.idea
# sbt specific
target/
.ensime*
.bsp

# IntelliJ specific
.idea/

# ENSIME specific
.ensime
.ensime_cache

# Metals specific
.bloop/
.metals/
metals.sbt

# vscode specific
.vscode
14 changes: 7 additions & 7 deletions build.sbt
Expand Up @@ -2,8 +2,8 @@ import ReleaseTransformations._

organization in ThisBuild := "net.ruippeixotog"

scalaVersion in ThisBuild := "2.13.1"
crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.10", "2.13.1")
scalaVersion in ThisBuild := "2.13.5"
crossScalaVersions in ThisBuild := Seq("2.12.13", "2.13.5")

lazy val core = project.in(file("core"))
.enablePlugins(TutPlugin)
Expand All @@ -16,10 +16,10 @@ lazy val core = project.in(file("core"))
"net.sourceforge.htmlunit" % "htmlunit" % "2.49.0",
"org.jsoup" % "jsoup" % "1.13.1",
"org.scalaz" %% "scalaz-core" % "7.3.3",
"com.typesafe.akka" %% "akka-http" % "10.1.14" % "test",
"com.typesafe.akka" %% "akka-stream" % "2.5.32" % "test",
"org.slf4j" % "slf4j-nop" % "1.7.30" % "test",
"org.specs2" %% "specs2-core" % "4.10.6" % "test"),
"com.typesafe.akka" %% "akka-http" % "10.1.13" % "test",
"com.typesafe.akka" %% "akka-stream" % "2.6.14" % "test",
"org.slf4j" % "slf4j-nop" % "1.7.30" % "test",
"org.specs2" %% "specs2-core" % "4.11.0" % "test"),

tutTargetDirectory := file("."))

Expand All @@ -40,7 +40,7 @@ lazy val config = project.in(file("modules/config"))

libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.4.1",
"org.specs2" %% "specs2-core" % "4.10.6" % "test"))
"org.specs2" %% "specs2-core" % "4.11.0" % "test"))

lazy val commonSettings = Seq(
resolvers ++= Seq(
Expand Down

0 comments on commit 8054c7d

Please sign in to comment.