From abf866126ff0428b70f4a0d0197d62419dfe74e6 Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 11:49:07 +0200 Subject: [PATCH 1/8] Update Scala Native to 0.5.1 --- build.sbt | 6 +++--- project/build.properties | 2 +- project/plugins.sbt | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) 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..ad611ec5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,12 +1,12 @@ -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") From 5b2514a9df1766f3336a4b3bf4f504282d500ce3 Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 11:59:21 +0200 Subject: [PATCH 2/8] Update sourcegraph plugin --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ad611ec5..5412eb0e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,4 +9,4 @@ 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") +addSbtPlugin("com.sourcegraph" % "sbt-sourcegraph" % "0.4.3") From c98f559029b322885fee1b2a1c4511be263a3f5a Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 12:28:25 +0200 Subject: [PATCH 3/8] Explicitly set semanticdb version for sourcegraph --- build.sbt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sbt b/build.sbt index 7888e0b1..58261174 100644 --- a/build.sbt +++ b/build.sbt @@ -16,6 +16,9 @@ val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq( ideSkipProject := (scalaVersion.value == scala2_12) // only import 2.13 projects ) +ThisBuild / semanticdbEnabled := true +ThisBuild / semanticdbVersion := "4.9.3" + lazy val root = project .in(file(".")) From 2d6d362df547090030c25fdc3e5aa293851d927c Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 12:37:17 +0200 Subject: [PATCH 4/8] Move semanticdb settings to common settings --- build.sbt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 58261174..76d5f74a 100644 --- a/build.sbt +++ b/build.sbt @@ -13,12 +13,11 @@ val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq( organization := "com.softwaremill.magnolia1_2", description := "Fast, easy and transparent typeclass derivation for Scala 2", updateDocs := UpdateVersionInDocs(sLog.value, organization.value, version.value, List(file("readme.md"))), - ideSkipProject := (scalaVersion.value == scala2_12) // only import 2.13 projects + ideSkipProject := (scalaVersion.value == scala2_12), // only import 2.13 projects + semanticdbEnabled := true, + semanticdbVersion := "4.9.3" ) -ThisBuild / semanticdbEnabled := true -ThisBuild / semanticdbVersion := "4.9.3" - lazy val root = project .in(file(".")) From 66456cd3e28d8de61f55983e5c19ee6af177828c Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 12:43:04 +0200 Subject: [PATCH 5/8] Set semanticdb version in the CI workflow --- .github/workflows/main.yml | 2 +- build.sbt | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c0699c8..1863f4f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: with: extraKey: sbt-cache-${{ runner.os }} - name: Generate LSIF - run: sbt 'set every semanticdbEnabled := true; set every semanticdbVersion := "4.4.33"' sourcegraphLsif + run: sbt 'set every semanticdbEnabled := true; set every semanticdbVersion := "4.9.3"' sourcegraphLsif - name: Upload LSIF data uses: sourcegraph/lsif-upload-action@master with: diff --git a/build.sbt b/build.sbt index 76d5f74a..3c6877e3 100644 --- a/build.sbt +++ b/build.sbt @@ -13,9 +13,7 @@ val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq( organization := "com.softwaremill.magnolia1_2", description := "Fast, easy and transparent typeclass derivation for Scala 2", updateDocs := UpdateVersionInDocs(sLog.value, organization.value, version.value, List(file("readme.md"))), - ideSkipProject := (scalaVersion.value == scala2_12), // only import 2.13 projects - semanticdbEnabled := true, - semanticdbVersion := "4.9.3" + ideSkipProject := (scalaVersion.value == scala2_12) // only import 2.13 projects, ) lazy val root = From 87db3d1952ac096a1329584b732002c2a2bf2a54 Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 12:43:55 +0200 Subject: [PATCH 6/8] Remove unnecessary coma --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3c6877e3..7888e0b1 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,7 @@ val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq( organization := "com.softwaremill.magnolia1_2", description := "Fast, easy and transparent typeclass derivation for Scala 2", updateDocs := UpdateVersionInDocs(sLog.value, organization.value, version.value, List(file("readme.md"))), - ideSkipProject := (scalaVersion.value == scala2_12) // only import 2.13 projects, + ideSkipProject := (scalaVersion.value == scala2_12) // only import 2.13 projects ) lazy val root = From c41b7175794593ee5cbc56dc2a9a7ab1c446cd1c Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 12:54:50 +0200 Subject: [PATCH 7/8] Restore sourcegraph plugin 0.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5412eb0e..ad611ec5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,4 +9,4 @@ 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.4.3") +addSbtPlugin("com.sourcegraph" % "sbt-sourcegraph" % "0.3.3") From 5fe0876795b6f78c7b5509e849270e6c09790caf Mon Sep 17 00:00:00 2001 From: kciesielski Date: Wed, 24 Apr 2024 13:05:08 +0200 Subject: [PATCH 8/8] Remove sourcegraph --- .github/workflows/main.yml | 28 ---------------------------- project/plugins.sbt | 1 - 2 files changed, 29 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1863f4f8..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.9.3"' 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/project/plugins.sbt b/project/plugins.sbt index ad611ec5..a97552d0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,4 +9,3 @@ 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")