diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2d588a..00fbd87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: - uses: coursier/cache-action@v8.1 - uses: coursier/setup-action@v3.0 with: - jvm: 8 + jvm: 17 apps: sbt scala-cli - run: sbt publishLocal # Validates the app descriptors, by aggregating them the way the diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0795eef..aab5867 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: - uses: coursier/cache-action@v8.1 - uses: coursier/setup-action@v3.0 with: - jvm: 8 + jvm: 17 apps: "sbt" - run: .github/scripts/gpg-setup.sh env: diff --git a/build.sbt b/build.sbt index b227531..4adbe90 100644 --- a/build.sbt +++ b/build.sbt @@ -1,31 +1,28 @@ inThisBuild(List( organization := "io.get-coursier", - homepage := Some(url("https://github.com/coursier/apps")), - licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), + homepage := Some(uri("https://github.com/coursier/apps")), + licenses := List(License.Apache2), developers := List( Developer( "alexarchambault", "Alexandre Archambault", "", - url("https://github.com/alexarchambault") + uri("https://github.com/alexarchambault") ) ) )) -lazy val shared = Def.settings( - Compile / resourceDirectory := baseDirectory.value / "resources", +// Bare settings are common settings in sbt 2.x: they're injected in all +// subprojects (including the root one). +Compile / resourceDirectory := baseDirectory.value / "resources" - // pura Java - crossPaths := false, - autoScalaLibrary := false -) +// pura Java +crossPaths := false +autoScalaLibrary := false lazy val apps = project - .settings(shared) lazy val `apps-contrib` = project - .settings(shared) -shared -skip.in(publish) := true +LocalRootProject / publish / skip := true \ No newline at end of file diff --git a/project/build.properties b/project/build.properties index e0a1aa0..97362a4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.13.0 +sbt.version=2.0.8