From 5655eabb182770f6c30964ca623a1c8c9ccc5b6a Mon Sep 17 00:00:00 2001 From: Krzysztof Ciesielski Date: Wed, 24 Apr 2024 13:09:23 +0200 Subject: [PATCH] [scala2] Update scala-native to 0.5.1 (#528) --- .github/workflows/main.yml | 28 ---------------------------- build.sbt | 6 +++--- project/build.properties | 2 +- project/plugins.sbt | 11 +++++------ 4 files changed, 9 insertions(+), 38 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c0699c8..9e760e68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,34 +50,6 @@ jobs: - name: Check MiMa # disable for major releases run: sbt -v core/mimaReportBinaryIssues - sourcegraph: - name: Upload index to sourcegraph - needs: [ci] - # run on external PRs, but not on internal PRs since those will be run by push to branch - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository - runs-on: ubuntu-20.04 - env: - JAVA_OPTS: -Xmx4G - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: coursier/setup-action@v1.1.2 - with: - jvm: adopt:11 - - name: Cache sbt - uses: coursier/cache-action@v6 - with: - extraKey: sbt-cache-${{ runner.os }} - - name: Generate LSIF - run: sbt 'set every semanticdbEnabled := true; set every semanticdbVersion := "4.4.33"' sourcegraphLsif - - name: Upload LSIF data - uses: sourcegraph/lsif-upload-action@master - with: - endpoint: https://sourcegraph.com - github_token: ${{ secrets.GITHUB_TOKEN }} - file: target/sbt-sourcegraph/dump.lsif - publish: name: Publish release needs: [ci] diff --git a/build.sbt b/build.sbt index 46b5b0da..7888e0b1 100644 --- a/build.sbt +++ b/build.sbt @@ -2,8 +2,8 @@ import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings import com.softwaremill.Publish.{updateDocs, ossPublishSettings} import com.softwaremill.UpdateVersionInDocs -val scala2_12 = "2.12.15" -val scala2_13 = "2.13.7" +val scala2_12 = "2.12.19" +val scala2_13 = "2.13.13" val scala2 = List(scala2_12, scala2_13) excludeLintKeys in Global ++= Set(ideSkipProject) @@ -73,7 +73,7 @@ lazy val test = (projectMatrix in file("test")) name := "magnolia-test", Test / scalacOptions += "-Ywarn-macros:after", Test / scalacOptions --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings"), - libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test, + libraryDependencies += "org.scalameta" %% "munit" % "1.0.0-M12" % Test, publishArtifact := false ) .jvmPlatform(scalaVersions = scala2) diff --git a/project/build.properties b/project/build.properties index baf5ff3e..04267b14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.7 +sbt.version=1.9.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 255f8d31..a97552d0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,12 +1,11 @@ -addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0") +addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") -val sbtSoftwareMillVersion = "2.0.9" +val sbtSoftwareMillVersion = "2.0.20" addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion) addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion) addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") -addSbtPlugin("com.sourcegraph" % "sbt-sourcegraph" % "0.3.3")