Upgrade sbt, scala and sbt-ci-release

sbt · Mar 21, 2024 · 7e85757 · 7e85757
1 parent 349ecbc
commit 7e85757
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 12 deletions.
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
@@ -2,7 +2,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.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/test-project-docker/project/build.properties b/test-project-docker/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.9.9
diff --git a/test-project-jdkpackager/project/build.properties b/test-project-jdkpackager/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.9.9
diff --git a/test-project-simple/project/build.properties b/test-project-simple/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.9.9
diff --git a/test-project-windows/project/build.properties b/test-project-windows/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.9.9