Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-1.9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
scala-steward-yyu[bot] committed Sep 2, 2023
2 parents 81dffe4 + 92af32e commit c02da6b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ lazy val featherweightGo = (crossProject(JVMPlatform, JSPlatform).crossType(Cros
)
.jsSettings(
scalacOptions += {
val a = (baseDirectory in LocalRootProject).value.toURI.toString
val a = (LocalRootProject / baseDirectory).value.toURI.toString
val g = "https://raw.githubusercontent.com/y-yu/featherweight_go/" + tagOrHash.value
s"-P:scalajs:mapSourceURI:$a->$g/"
}
Expand Down Expand Up @@ -72,13 +72,13 @@ lazy val featherweightGoJS = featherweightGo.js

lazy val publishSettings = Seq(
publishMavenStyle := true,
publishTo := Some(
publishTo := (
if (isSnapshot.value)
Opts.resolver.sonatypeSnapshots
Opts.resolver.sonatypeOssSnapshots.headOption
else
Opts.resolver.sonatypeStaging
Some(Opts.resolver.sonatypeStaging)
),
publishArtifact in Test := false,
Test / publishArtifact := false,
pomExtra :=
<developers>
<developer>
Expand Down Expand Up @@ -113,7 +113,7 @@ lazy val publishSettings = Seq(
)

val tagName = Def.setting {
s"v${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}"
s"v${if (releaseUseGlobalVersion.value) (ThisBuild / version).value else version.value}"
}

val tagOrHash = Def.setting {
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.4.9
sbt.version=1.9.3
8 changes: 4 additions & 4 deletions sbt
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@

set -o pipefail

declare -r sbt_release_version="1.9.0"
declare -r sbt_unreleased_version="1.9.0"
declare -r sbt_release_version="1.9.3"
declare -r sbt_unreleased_version="1.9.3"

declare -r latest_213="2.13.10"
declare -r latest_212="2.12.17"
declare -r latest_213="2.13.11"
declare -r latest_212="2.12.18"
declare -r latest_211="2.11.12"
declare -r latest_210="2.10.7"
declare -r latest_29="2.9.3"
Expand Down

0 comments on commit c02da6b

Please sign in to comment.