Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[scala2] Update scala-native 0.5.1 #528

Merged
merged 8 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.7
sbt.version=1.9.9
11 changes: 5 additions & 6 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Loading