diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..7f630a0 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,24 @@ +name: test +on: + push: + branches: + - develop + pull_request: +jobs: + test: + strategy: + fail-fast: false + matrix: + java: [8, 11, 17] + 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 -Dfile.encoding=UTF8 compilerInterface/headerCheck jvmfmtCheck dummyBridge/test doc diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8dbf920..0000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: ~> 1.0 # needed for imports - -import: scala/scala-dev:travis/default.yml - -language: scala - -scala: 2.12.10 - -env: - - ADOPTOPENJDK=8 - - ADOPTOPENJDK=11 - -script: sbt -Dfile.encoding=UTF8 compilerInterface/headerCheck jvmfmtCheck dummyBridge/test doc diff --git a/build.sbt b/build.sbt index 6e22a16..d1733b3 100644 --- a/build.sbt +++ b/build.sbt @@ -60,9 +60,9 @@ lazy val compilerInterface = (project in file("compiler-interface")) commonSettings, name := "Compiler Interface", scalaVersion := scala212, - managedSourceDirectories in Compile += + Compile / managedSourceDirectories += baseDirectory.value / "src" / "main" / "contraband-java", - sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-java", + Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-java", crossPaths := false, autoScalaLibrary := false, mimaPreviousArtifacts := Set( @@ -104,9 +104,9 @@ lazy val dummyApiInfo = (project in file("dummy-apiinfo")) .dependsOn(compilerInterface) .settings( scalaVersion := scala212, - managedSourceDirectories in Compile += + Compile / managedSourceDirectories += baseDirectory.value / "src" / "main" / "contraband-java", - sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-java", + Compile / generateContrabands / sourceManaged := baseDirectory.value / "src" / "main" / "contraband-java", crossPaths := false, autoScalaLibrary := false, publish / skip := true, diff --git a/project/build.properties b/project/build.properties index a919a9b..c8fcab5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.8 +sbt.version=1.6.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 75f7636..ace8ae5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.4") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.3") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.4.0") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.3.0") addSbtPlugin("com.swoval" % "sbt-jvm-format" % "0.3.1")