diff --git a/NOTICE b/NOTICE
index 32c7f69..10ac8bd 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
 sbt-scala-module
-Copyright (c) 2013-2021 EPFL
-Copyright (c) 2013-2021 Lightbend, Inc.
+Copyright (c) 2013-2022 EPFL
+Copyright (c) 2013-2022 Lightbend, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License").
 Unless required by applicable law or agreed to in writing, software
diff --git a/build.sbt b/build.sbt
index 9cf87b3..9b8bb69 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,5 +9,5 @@ developers          := List(Developer("", "", "", url("https://scala-lang.org"))
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") // set version, scmInfo, publishing settings
-addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "2.0.0")  // brings in MiMa
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") // set version, scmInfo, publishing settings
+addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "2.0.1")  // brings in MiMa
diff --git a/project/build.properties b/project/build.properties
index 10fd9ee..3161d21 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.6.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 3927997..ae3b908 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
diff --git a/src/main/scala/ScalaModulePlugin.scala b/src/main/scala/ScalaModulePlugin.scala
index 5539c0e..3ad4392 100644
--- a/src/main/scala/ScalaModulePlugin.scala
+++ b/src/main/scala/ScalaModulePlugin.scala
@@ -67,7 +67,13 @@ object ScalaModulePlugin extends AutoPlugin {
     organization := "org.scala-lang.modules",
 
     // don't use for doc scope, scaladoc warnings are not to be reckoned with
-    Compile / compile / scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked", "-Xlint"),
+    Compile / compile / scalacOptions ++= Seq("-feature", "-deprecation", "-unchecked"),
+    Compile / compile / scalacOptions ++= {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, _)) => Seq("-Xlint")
+        case _ => Seq.empty
+      }
+    },
 
     // Generate $name.properties to store our version as well as the scala version used to build
     Compile / resourceGenerators += Def.task {