From 93eb55e07d5841420eadade5aacd073e1378e1b4 Mon Sep 17 00:00:00 2001 From: Vedant <83997633+vedantmgoyal2009@users.noreply.github.com> Date: Sun, 24 Jul 2022 10:29:58 +0530 Subject: [PATCH 1/4] Create winget.yml --- .github/workflows/winget.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/winget.yml diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml new file mode 100644 index 0000000000..b3f09ef73b --- /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@latest + with: + identifier: sbt.sbt + token: ${{ secrets.WINGET_TOKEN }} From 789d334b2a1782cdb3a77c1d7536516c5fa0c259 Mon Sep 17 00:00:00 2001 From: Vedant <83997633+vedantmgoyal2009@users.noreply.github.com> Date: Thu, 29 Sep 2022 17:06:15 +0530 Subject: [PATCH 2/4] Update winget.yml --- .github/workflows/winget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index b3f09ef73b..93d176d69c 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -6,7 +6,7 @@ jobs: publish: runs-on: windows-latest # action can only be run on windows steps: - - uses: vedantmgoyal2009/winget-releaser@latest + - uses: vedantmgoyal2009/winget-releaser@v1 with: identifier: sbt.sbt token: ${{ secrets.WINGET_TOKEN }} From 1ad8ad7c33d5a20566692287d564d201ca848151 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 30 Oct 2022 16:33:20 -0400 Subject: [PATCH 3/4] lm-coursier-shaded 2.0.12 https://github.com/coursier/sbt-coursier/releases/tag/v2.0.12 --- main/src/main/scala/sbt/coursierint/LMCoursier.scala | 1 + project/Dependencies.scala | 2 +- project/build.properties | 2 +- sbt-app/src/repo-override-test/repo.config | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) 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-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 From ecfb0624e911798a6d2bdf1f6a7c45acb1c59b1e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 30 Oct 2022 22:16:18 -0400 Subject: [PATCH 4/4] sbt 1.7.3 --- build.sbt | 2 +- sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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