diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 251e54e..181c219 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -10,14 +10,19 @@ jobs: build: runs-on: ubuntu-latest - + strategy: + matrix: + # OWL API 5.5 requires Java 11 + java: [ 11, 21 ] + name: Java ${{ matrix.java }} steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 with: - java-version: '11' - distribution: 'adopt' + java-version: ${{ matrix.java }} + distribution: 'temurin' + cache: 'sbt' - name: Setup SBT uses: sbt/setup-sbt@v1 - name: Run tests diff --git a/build.sbt b/build.sbt index 625556d..07479ca 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ lazy val gitCommitString = SettingKey[String]("gitCommit") lazy val commonSettings = Seq( organization := "org.geneontology", - version := "2.3.4", + version := "3.0.0", licenses := Seq("MIT license" -> url("https://opensource.org/licenses/MIT")), homepage := Some(url("https://github.com/balhoff/relation-graph")), scalaVersion := "2.13.17", @@ -15,10 +15,12 @@ lazy val commonSettings = Seq( lazy val publishSettings = Seq( Test / publishArtifact := false, publishMavenStyle := true, + // sbt-git's GitVersioning (enabled for cli) otherwise derives isSnapshot from git state for the whole build + isSnapshot := version.value.endsWith("-SNAPSHOT"), publishTo := { - val nexus = "https://oss.sonatype.org/" - if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots") - else Some("releases" at nexus + "service/local/staging/deploy/maven2") + val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/" + if (isSnapshot.value) Some("central-snapshots" at centralSnapshots) + else localStaging.value }, pomExtra := @@ -46,12 +48,12 @@ lazy val core = project libraryDependencies ++= Seq( "dev.zio" %% "zio" % zioVersion, "dev.zio" %% "zio-streams" % zioVersion, - "org.geneontology" %% "whelk-owlapi" % "1.2.1", + "org.geneontology" %% "whelk-owlapi" % "2.0.0", "org.apache.jena" % "apache-jena-libs" % "4.10.0" exclude("org.slf4j", "slf4j-log4j12"), "com.typesafe.scala-logging" %% "scala-logging" % "3.9.6", "dev.zio" %% "zio-test" % zioVersion % Test, "dev.zio" %% "zio-test-sbt" % zioVersion % Test, - "com.outr" %% "scribe-slf4j" % scribeVersion % Test + "com.outr" %% "scribe-slf4j2" % scribeVersion % Test ) ) .settings(publishSettings) @@ -68,7 +70,7 @@ lazy val cli = project executableScriptName := "relation-graph", publish / skip := true, libraryDependencies ++= Seq( - "com.outr" %% "scribe-slf4j" % scribeVersion, + "com.outr" %% "scribe-slf4j2" % scribeVersion, "com.github.alexarchambault" %% "case-app" % "2.1.0", "io.circe" %% "circe-yaml" % "0.14.2", ), diff --git a/project/build.properties b/project/build.properties index 01a16ed..e0a1aa0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.7 +sbt.version=1.13.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index f5e39ec..1b4db34 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.4") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.2")