diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 7009ece7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,98 +0,0 @@ -dist: xenial -sudo: false -language: scala - -before_install: -- docker run -p 6379:6379 -d redis:alpine -- docker run -p 6380:6379 -d eqalpha/keydb -- git fetch --tags - -before_cache: -- rm -fv $HOME/.ivy2/.sbt.ivy.lock -- find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete -- find $HOME/.sbt -name "*.lock" -print -delete - -after_success: -- bash <(curl -s https://codecov.io/bash) - -sbt_args: -Dfile.encoding=UTF8 -Dsbt.color=always -Dsbt.supershell=false - -stages: -- name: Format - if: tag IS NOT present -- name: Test - if: tag IS NOT present -- name: Publish Snapshot 2.12 - if: branch = master AND type = push AND tag IS NOT present AND NOT fork -- name: Publish Snapshot 2.13 - if: branch = master AND type = push AND tag IS NOT present AND NOT fork -- name: Release 2.12 - if: type != pull_request AND tag IS present AND NOT fork -- name: Release 2.13 - if: type != pull_request AND tag IS present AND NOT fork - -scala_212: &scala_212 2.12.12 -scala_213: &scala_213 2.13.3 - -jdk_lts: &jdk_lts openjdk11 -jdk_latest: &jdk_latest openjdk15 - -scala: -- *scala_212 -- *scala_213 -jdk: -- *jdk_lts -- *jdk_latest - -script: sbt ++$TRAVIS_SCALA_VERSION fullTest - -jobs: - include: - - stage: Format - name: Check with Scalafmt - script: sbt ++$TRAVIS_SCALA_VERSION fmtCheck - jdk: *jdk_lts - scala: *scala_213 - - - stage: Test - name: Compile benchmarks - script: sbt ++$TRAVIS_SCALA_VERSION benchBuild - jdk: *jdk_lts - scala: *scala_213 - - - stage: Publish Snapshot 2.12 - name: Publish a snapshot for Scala 2.12 - script: CI_SNAPSHOT_RELEASE=publish sbt ++$TRAVIS_SCALA_VERSION releaseIt - jdk: *jdk_lts - scala: *scala_212 - - - stage: Publish Snapshot 2.13 - name: Publish a snapshot for Scala 2.13 - script: CI_SNAPSHOT_RELEASE=publish sbt ++$TRAVIS_SCALA_VERSION releaseIt - jdk: *jdk_lts - scala: *scala_213 - - - stage: Release 2.12 - name: Release for Scala 2.12 - script: CI_RELEASE=publishSigned sbt ++$TRAVIS_SCALA_VERSION releaseIt - jdk: *jdk_lts - scala: *scala_212 - - - stage: Release 2.13 - name: Release for Scala 2.13 - script: CI_RELEASE=publishSigned sbt ++$TRAVIS_SCALA_VERSION releaseIt - jdk: *jdk_lts - scala: *scala_213 - -services: -- docker - -cache: - directories: - - "$HOME/.cache/coursier" - - "$HOME/.ivy2/cache" - - "$HOME/.sbt/boot/" - - "$HOME/.sbt" - - "lib_managed" - - "target" - - "project/target" diff --git a/README.md b/README.md index 77ba3512..7f77ea61 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ ## LaserDisc +![CI](https://github.com/laserdisc-io/laserdisc/workflows/CI/badge.svg?branch=master) +![Release](https://github.com/laserdisc-io/laserdisc/workflows/Release/badge.svg) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d548a2d7facc4e42b422940dbf5c8382)](https://app.codacy.com/app/barambani/laserdisc?utm_source=github.com&utm_medium=referral&utm_content=laserdisc-io/laserdisc&utm_campaign=Badge_Grade_Dashboard) -[![Build Status](https://travis-ci.org/laserdisc-io/laserdisc.svg?branch=master)](https://travis-ci.org/laserdisc-io/laserdisc) [![codecov.io](https://codecov.io/github/laserdisc-io/laserdisc/coverage.svg?branch=master)](https://codecov.io/github/laserdisc-io/laserdisc?branch=master) [![Join the chat at https://gitter.im/laserdisc-io/laserdisc](https://badges.gitter.im/laserdisc-io/laserdisc.svg)](https://gitter.im/laserdisc-io/laserdisc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) diff --git a/build.sbt b/build.sbt index 6be3b4f8..15db1871 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,8 @@ -// shadow sbt-scalajs' crossProject and CrossType from Scala.js 0.6.x import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject} +lazy val scala_212 = "2.12.12" +lazy val scala_213 = "2.13.3" + val V = new { val cats = "2.3.0" val `cats-effect` = "2.3.0" @@ -231,6 +233,8 @@ val versionDependantScalacOptions = Def.setting { } lazy val commonSettings = Seq( + scalaVersion := scala_213, + crossScalaVersions := Seq(scala_212, scala_213), scalacOptions ++= versionDependantScalacOptions.value, Compile / console / scalacOptions --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings", "-Wconf:any:error"), Test / console / scalacOptions := (Compile / console / scalacOptions).value @@ -333,6 +337,7 @@ lazy val `core-bench` = project .enablePlugins(JmhPlugin) .settings( name := "laserdisc-core-benchmarks", + scalaVersion := scala_213, publishArtifact := false ) @@ -342,6 +347,7 @@ lazy val `fs2-bench` = project .enablePlugins(JmhPlugin) .settings( name := "laserdisc-fs2-benchmarks", + scalaVersion := scala_213, publishArtifact := false, scalacOptions ++= versionDependantScalacOptions.value, libraryDependencies ++= fs2BenchDeps.value, diff --git a/project/plugins.sbt b/project/plugins.sbt index 22efc3e1..895d6e55 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,3 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.4") -addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.2.0")