fixes

tested it on a branch, upload to github works now.

Author: lrytz

.travis.yml

@@ -22,7 +22,8 @@ install:
   - sudo apt-get install -y rpm
 
 language: scala
-jdk: openjdk8
+# java 11+ needed for sttp
+jdk: openjdk21
 
 env:
   global:

admin/build.ps1

@@ -35,8 +35,7 @@ if ($env:APPVEYOR_FORCED_BUILD -eq 'true') {
   clearIvyCache
   if ($env:mode -eq 'release') {
     echo "Running a release for $env:version"
-    $repositoriesFile="$env:APPVEYOR_BUILD_FOLDER\conf\repositories"
-    & cmd /c "sbt ""-Dsbt.override.build.repos=true"" ""-Dsbt.repository.config=$repositoriesFile"" ""-Dproject.version=$env:version"" ""show fullResolvers"" clean update ghUpload" '2>&1'
+    & cmd /c "sbt ""-Dproject.version=$env:version"" ""show fullResolvers"" clean update ghUpload" '2>&1'
     checkExit
   } else {
     echo "Unknown mode: '$env:mode'"

admin/build.sh

@@ -92,10 +92,8 @@ if [[ "$TRAVIS_EVENT_TYPE" == "api" ]]; then
   elif [[ "$mode" == "release" ]]; then
     echo "Running a release for $version"
     triggerMsiRelease
-    repositoriesFile="$TRAVIS_BUILD_DIR/conf/repositories"
     # The log is too long for the travis UI, so remove ANSI codes to have a clean raw version
     sbt -Dsbt.log.noformat=true \
-      -Dsbt.override.build.repos=true -Dsbt.repository.config="$repositoriesFile" \
       -Dproject.version=$version \
       "show fullResolvers" clean update ghUpload
     triggerSmoketest

appveyor.yml

@@ -6,10 +6,11 @@ branches:
     - 2.12.x
     - 2.13.x
 
-image: Visual Studio 2015
+image: Visual Studio 2019
 
 environment:
-  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  # java 11+ needed for sttp
+  JAVA_HOME: C:\Program Files\Java\jdk21
   AWS_ACCESS_KEY_ID:
     secure: X1Ix1soRBDMtfbi8IFNPOggDP2XquhW+uKcJ+XC0kiM=
   AWS_SECRET_ACCESS_KEY:
@@ -18,7 +19,7 @@ environment:
     secure: nfWNfbyzNQwdg1eWHZX93XIJLoAhFOr1fR8+L86s7a3jdo/HydEZ8TyEKsPipQ+/
 
 install:
-  - cmd: choco install sbt --version=1.3.2 -ia "INSTALLDIR=""C:\sbt"""
+  - cmd: choco install sbt --version=1.10.11 -ia "INSTALLDIR=""C:\sbt"""
   - cmd: SET PATH=C:\sbt\bin;%JAVA_HOME%\bin;%PATH%
 
 build_script:

build.sbt

@@ -1,5 +1,7 @@
 import ScalaDist.{s3Upload, ghUpload}
 
+resolvers += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
+
 // so we don't require a native git install
 useJGit
 
@@ -41,18 +43,30 @@ s3Upload := {
 
 ghUpload := {
   import sttp.client3._
+  import _root_.io.circe._, _root_.io.circe.parser._
 
   val log = streams.value.log
   val ghRelease = s"v${(Universal / version).value}"
+
+  val token = sys.env.getOrElse("GITHUB_OAUTH_TOKEN", throw new MessageOnlyException("GITHUB_OAUTH_TOKEN missing"))
+
   val backend = HttpURLConnectionBackend()
+
+  val rRes = basicRequest
+    .get(uri"https://api.github.com/repos/scala/scala/releases/tags/$ghRelease")
+    .header("Accept", "application/vnd.github+json")
+    .header("Authorization", s"Bearer $token")
+    .header("X-GitHub-Api-Version", "2022-11-28")
+    .send(backend)
+  val releaseId = rRes.body.flatMap(parse).getOrElse(Json.Null).hcursor.downField("id").as[Int].getOrElse(
+    throw new MessageOnlyException(s"Release not found: $ghRelease"))
+
   (s3Upload / mappings).value map { case (file, _) =>
     log.info(s"Uploading ${file.getAbsolutePath} as ${file.getName} to https://github.com/scala/scala/releases/tag/$ghRelease")
 
-    val token = sys.env.getOrElse("GITHUB_OAUTH_TOKEN", throw new MessageOnlyException("GITHUB_OAUTH_TOKEN missing"))
-
     // https://docs.github.com/en/rest/releases/assets?apiVersion=2022-11-28#upload-a-release-asset
     val request = basicRequest
-      .post(uri"https://uploads.github.com/repos/scala/scala/releases/${ghRelease}/assets?name=${file.getName}")
+      .post(uri"https://uploads.github.com/repos/scala/scala/releases/${releaseId}/assets?name=${file.getName}")
       .contentType("application/octet-stream")
       .header("Accept", "application/vnd.github+json")
       .header("Authorization", s"Bearer $token")

conf/repositories

@@ -1 +1 @@
-sbt.version=1.10.6
+sbt.version=1.10.11

project/build.properties

@@ -8,6 +8,10 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
 libraryDependencies += "com.amazonaws" % "aws-java-sdk-s3" % "1.12.5"
 
 libraryDependencies += "com.softwaremill.sttp.client3" %% "core" % "3.11.0"
+libraryDependencies ++= Seq(
+  "io.circe" %% "circe-core",
+  "io.circe" %% "circe-generic",
+  "io.circe" %% "circe-parser"
+).map(_ % "0.14.13")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1")
-