Merge branch 'support-scala-3'

rtyley · Jan 16, 2025 · b74281b · b74281b
2 parents 07280ba + f7f0e92
commit b74281b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,14 +2,13 @@ import ReleaseTransformations._
 import Dependencies._
 
 lazy val baseSettings = Seq(
-  scalaVersion := "2.13.12",
-  // crossScalaVersions := Seq(scalaVersion.value, "3.3.1"),
+  scalaVersion := "2.13.16",
   organization := "com.madgag.scala-git",
   scmInfo := Some(ScmInfo(
     url("https://github.com/rtyley/scala-git"),
     "scm:git:[email protected]:rtyley/scala-git.git"
   )),
-  licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
+  licenses := Seq(License.Apache2),
   scalacOptions ++= Seq("-deprecation", "-unchecked"),
   libraryDependencies ++= Seq(madgagCompress % Test, scalatest % Test)
 )

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.7