From e24957c067d30050eb5895ea66170d7cc063e2c3 Mon Sep 17 00:00:00 2001 From: "scala-steward-yyu[bot]" <127873021+scala-steward-yyu[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 18:03:37 +0000 Subject: [PATCH 1/4] Applied Scalafix rule(s) https://gist.githubusercontent.com/eed3si9n/57e83f5330592d968ce49f0d5030d4d5/raw/7f576f16a90e432baa49911c9a66204c354947bb/Sbt0_13BuildSyntax.scala See https://eed3si9n.com/syntactic-scalafix-rule-for-unified-slash-syntax for details --- build.sbt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index a9cbb90..a1afb7e 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ lazy val root = project.in(file(".")) featherweightGoJVM ) -lazy val featherweightGo = (crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Full) in file(".")) +lazy val featherweightGo = ((file(".") / crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Full))) .settings( scalaVersion := scala213Version, scalacOptions ++= defaultScalacOptions, @@ -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/" } @@ -47,7 +47,7 @@ lazy val featherweightGo = (crossProject(JVMPlatform, JSPlatform).crossType(Cros mainClass := Some("featherweightgo.Main") ) -lazy val featherweightGoCore = (crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure) in file("./core")) +lazy val featherweightGoCore = ((file("./core") / crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure))) .settings( organization := "com.github.y-yu", name := "featherweight_go", @@ -78,7 +78,7 @@ lazy val publishSettings = Seq( else Opts.resolver.sonatypeStaging ), - publishArtifact in Test := false, + (Test / publishArtifact) := false, pomExtra := @@ -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 { From 9c12c2ac2e35265ca2ca5feebacdc941f31b68aa Mon Sep 17 00:00:00 2001 From: "scala-steward-yyu[bot]" <127873021+scala-steward-yyu[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 18:03:37 +0000 Subject: [PATCH 2/4] Update sbt to 1.9.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index dbae93b..3040987 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.9.4 From 81dffe437a881f8c6de715db35c33e2c00260bea Mon Sep 17 00:00:00 2001 From: "scala-steward-yyu[bot]" <127873021+scala-steward-yyu[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:05:49 +0000 Subject: [PATCH 3/4] Revert commit(s) 9c12c2a, e24957c --- build.sbt | 10 +++++----- project/build.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index a1afb7e..a9cbb90 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ lazy val root = project.in(file(".")) featherweightGoJVM ) -lazy val featherweightGo = ((file(".") / crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Full))) +lazy val featherweightGo = (crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Full) in file(".")) .settings( scalaVersion := scala213Version, scalacOptions ++= defaultScalacOptions, @@ -38,7 +38,7 @@ lazy val featherweightGo = ((file(".") / crossProject(JVMPlatform, JSPlatform).c ) .jsSettings( scalacOptions += { - val a = ((LocalRootProject / baseDirectory)).value.toURI.toString + val a = (baseDirectory in LocalRootProject).value.toURI.toString val g = "https://raw.githubusercontent.com/y-yu/featherweight_go/" + tagOrHash.value s"-P:scalajs:mapSourceURI:$a->$g/" } @@ -47,7 +47,7 @@ lazy val featherweightGo = ((file(".") / crossProject(JVMPlatform, JSPlatform).c mainClass := Some("featherweightgo.Main") ) -lazy val featherweightGoCore = ((file("./core") / crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure))) +lazy val featherweightGoCore = (crossProject(JVMPlatform, JSPlatform).crossType(CrossType.Pure) in file("./core")) .settings( organization := "com.github.y-yu", name := "featherweight_go", @@ -78,7 +78,7 @@ lazy val publishSettings = Seq( else Opts.resolver.sonatypeStaging ), - (Test / publishArtifact) := false, + publishArtifact in Test := false, pomExtra := @@ -113,7 +113,7 @@ lazy val publishSettings = Seq( ) val tagName = Def.setting { - s"v${if (releaseUseGlobalVersion.value) ((ThisBuild / version)).value else version.value}" + s"v${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}" } val tagOrHash = Def.setting { diff --git a/project/build.properties b/project/build.properties index 3040987..dbae93b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.4 +sbt.version=1.4.9 From 3f9eb8cbcbbb27e8e462ed3927756c2dc74474dc Mon Sep 17 00:00:00 2001 From: "scala-steward-yyu[bot]" <127873021+scala-steward-yyu[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:05:50 +0000 Subject: [PATCH 4/4] Update sbt to 1.9.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 52413ab..3040987 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 +sbt.version=1.9.4