diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..852d211 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,27 @@ +name: test +on: + push: + branches: + - main + pull_request: +jobs: + test: + strategy: + fail-fast: false + matrix: + java: [8, 11, 17] + scala: [2.11.12, 2.12.15, 2.13.6, 3.0.2] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: coursier/cache-action@v6 + - uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: ${{matrix.java}} + - name: Test + run: | + sbt ++${{matrix.scala}} test + git diff --exit-code # check scalariform diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..512b559 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,21 @@ +name: Release +on: + push: + tags: ["*"] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 8 + - run: sbt ci-release + env: + PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}} + PGP_SECRET: ${{secrets.PGP_SECRET}} + SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}} + SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 061dbd2..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: ~> 1.0 # needed for imports -import: scala/scala-dev:travis/default.yml -language: scala - -scala: - - 2.11.12 - - 2.12.14 - - 2.13.6 - - 3.0.0 -env: - - ADOPTOPENJDK=8 - - ADOPTOPENJDK=11 - -before_install: - - git fetch --tags - -script: - - sbt "++${TRAVIS_SCALA_VERSION}" test - - git diff --exit-code # check scalariform - -stages: - - name: release - if: (tag IS present) AND NOT fork - -jobs: - include: - - stage: release - script: sbt ci-release - -notifications: - email: - - seth.tisue@lightbend.com diff --git a/README.md b/README.md index 93674e3..faccad2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -# scala-logging [![Build Status](https://travis-ci.com/lightbend/scala-logging.svg?branch=master)](https://travis-ci.com/lightbend/scala-logging) - Scala Logging is a **convenient** and **fast** logging library wrapping [SLF4J](http://www.slf4j.org). It's convenient, because you can simply call log methods, *without* checking whether the respective log level is enabled: diff --git a/build.sbt b/build.sbt index df64b53..e9299d2 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,8 @@ // basics name := "scala-logging" +crossScalaVersions := Seq("3.0.2", "2.11.12", "2.12.15", "2.13.6") +scalaVersion := crossScalaVersions.value.head scalacOptions ++= Seq( "-unchecked", "-deprecation", diff --git a/project/plugins.sbt b/project/plugins.sbt index 515f578..c827dc4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,3 @@ addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6") addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.2") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9") -addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.2.0")