Merge pull request #1566 from mkurz/upgrade-sbt

Upgrade sbt, scala and sbt-ci-release to avoid deprecated repo.scala-sbt.org
sbt · Apr 11, 2024 · 612d391 · 612d391
2 parents cb29893 + 7f17f57
commit 612d391
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ target/
 .ensime*
 .bloop/*
 .metals/*
+.bsp/
diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ organization := "com.github.sbt"
 homepage := Some(url("https://github.com/sbt/sbt-native-packager"))
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
-Global / scalaVersion := "2.12.12"
+Global / scalaVersion := "2.12.19"
 
 // crossBuildingSettings
 crossSbtVersions := Vector("1.1.6")

diff --git a/integration-tests-ansible/test-project-play-rpm/build.sbt b/integration-tests-ansible/test-project-play-rpm/build.sbt
@@ -10,8 +10,6 @@ scalacOptions in ThisBuild ++= Seq(
   "-Xlint"
 )
 
-resolvers in ThisBuild += Resolver.typesafeRepo("releases")
-
 name := "test-project-play-rpm"
 
 description := "Demo of RPM packaging"

diff --git a/integration-tests-ansible/test-project-play-rpm/project/build.properties b/integration-tests-ansible/test-project-play-rpm/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=1.9.9
diff --git a/integration-tests-ansible/test-project-play-rpm/project/plugins.sbt b/integration-tests-ansible/test-project-play-rpm/project/plugins.sbt
@@ -1,5 +1,3 @@
-resolvers += Resolver.typesafeRepo("releases")
-
 libraryDependencies <+= Def.setting[ModuleID] {
   Defaults
     .sbtPluginExtra(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.9.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0")
+addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")
+addSbtPlugin("com.github.sbt" % "sbt-site-sphinx" % "1.7.0")
 
 // releasing
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 

diff --git a/src/sbt-test/windows/test-bat-template/build.sbt b/src/sbt-test/windows/test-bat-template/build.sbt
@@ -114,18 +114,16 @@ TaskKey[Unit]("checkScript") := {
   checkOutput("include symbols on -D", Seq("-Dtest.hoge=\\[]!< >%"), "property(test.hoge) is [\\[]!< >%]\nSUCCESS!")
   checkOutput("include symbols on normal args", Seq("\"\\[]!< >%\""), "arg #0 is [\\[]!< >%]\nSUCCESS!")
 
-  /* fails test because symbols '<' and '>' cannot be properly escaped during cmd execution
   checkOutput(
     "include symbols with double quote",
     Seq("-Dtest.huga=\"[]!<>%\""),
     "property(test.huga) is [[]!<>%]\nSUCCESS!"
   )
-  */
 
   checkOutput(
     "include symbols with double quote2",
-    Seq("-Dtest.hoge=\\[]!< >%", "\"\\[]!< >%\"", "-Dtest.huga=\\[]!<>%"),
-    "arg #0 is [\\[]!< >%]\nproperty(test.hoge) is [\\[]!< >%]\nproperty(test.huga) is [\\[]!<>%]\nSUCCESS!"
+    Seq("-Dtest.hoge=\\[]!< >%", "\"\\[]!< >%\"", "-Dtest.huga=\\[]!%"),
+    "arg #0 is [\\[]!< >%]\nproperty(test.hoge) is [\\[]!< >%]\nproperty(test.huga) is [\\[]!%]\nSUCCESS!"
   )
 
   // can't success include double-quote. arguments pass from Process(Seq("-Da=xx\"yy", "aa\"bb")) is parsed (%1="-Da", %2="xx\"yy aa\"bb") by cmd.exe ...