diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml new file mode 100644 index 0000000000..93d176d69c --- /dev/null +++ b/.github/workflows/winget.yml @@ -0,0 +1,12 @@ +name: Publish to WinGet +on: + release: + types: [released] +jobs: + publish: + runs-on: windows-latest # action can only be run on windows + steps: + - uses: vedantmgoyal2009/winget-releaser@v1 + with: + identifier: sbt.sbt + token: ${{ secrets.WINGET_TOKEN }} diff --git a/build.sbt b/build.sbt index 90721c54f2..846c7a43ff 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ import scala.util.Try // ThisBuild settings take lower precedence, // but can be shared across the multi projects. ThisBuild / version := { - val v = "1.7.3-SNAPSHOT" + val v = "1.7.4-SNAPSHOT" nightlyVersion.getOrElse(v) } ThisBuild / version2_13 := "2.0.0-SNAPSHOT" diff --git a/main/src/main/scala/sbt/coursierint/LMCoursier.scala b/main/src/main/scala/sbt/coursierint/LMCoursier.scala index 36d7cf5241..ebdf02d78c 100644 --- a/main/src/main/scala/sbt/coursierint/LMCoursier.scala +++ b/main/src/main/scala/sbt/coursierint/LMCoursier.scala @@ -20,6 +20,7 @@ import lmcoursier.definitions.{ Strict => CStrict, } import lmcoursier._ +import lmcoursier.syntax._ import lmcoursier.credentials.Credentials import Keys._ import sbt.internal.util.Util diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 523671011e..0185b95f81 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -77,7 +77,7 @@ object Dependencies { def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompile", zincCompile) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) - val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.10" + val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.12" def sjsonNew(n: String) = Def.setting("com.eed3si9n" %% n % "0.9.1") // contrabandSjsonNewVersion.value diff --git a/project/build.properties b/project/build.properties index 5b12c1dc65..563a014da4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.0 +sbt.version=1.7.2 diff --git a/sbt b/sbt index abaf2981ba..2abd8428d1 100755 --- a/sbt +++ b/sbt @@ -1,7 +1,7 @@ #!/usr/bin/env bash set +e -declare builtin_sbt_version="1.7.2" +declare builtin_sbt_version="1.7.3" declare -a residual_args declare -a java_args declare -a scalac_args diff --git a/sbt-app/src/repo-override-test/repo.config b/sbt-app/src/repo-override-test/repo.config index 68dbabf812..49770caeb3 100644 --- a/sbt-app/src/repo-override-test/repo.config +++ b/sbt-app/src/repo-override-test/repo.config @@ -1,3 +1,3 @@ [repositories] local - jcenter: https://jcenter.bintray.com/ + sonatype-releases: https://oss.sonatype.org/content/repositories/releases