diff --git a/build.sbt b/build.sbt
index c3c1adb6..867d86c8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -33,7 +33,7 @@ ThisBuild / homepage := Some(
 val scala211 = "2.11.12"
 val scala212 = "2.12.13"
 val scala213 = "2.13.5"
-val scala3 = "3.0.0-RC1"
+val scala3 = "3.0.0-RC3"
 
 scalaVersion := scala213
 
@@ -78,23 +78,23 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
       "io.cucumber" % "cucumber-core" % cucumberVersion,
       // Users have to provide it (for JacksonDefaultDataTableTransformer)
       ("com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion % Provided)
-        .withDottyCompat(scalaVersion.value),
+        .cross(CrossVersion.for3Use2_13),
       "junit" % "junit" % junitVersion % Test,
       "io.cucumber" % "cucumber-junit" % cucumberVersion % Test,
       ("org.mockito" %% "mockito-scala" % mockitoScalaVersion % Test)
-        .withDottyCompat(scalaVersion.value)
+        .cross(CrossVersion.for3Use2_13)
     ),
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, n)) if n <= 12 =>
           List("org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2")
         case Some((3, 0)) =>
-          List("io.github.gaeljw" %% "typetrees" % "0.2.0")
+          List("io.github.gaeljw" %% "typetrees" % "0.4.0")
         case _ => Nil
       }
     },
-    unmanagedSourceDirectories in Compile ++= {
-      val sourceDir = (sourceDirectory in Compile).value
+    Compile / unmanagedSourceDirectories ++= {
+      val sourceDir = (Compile / sourceDirectory).value
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, n)) if n <= 11 =>
           Seq(sourceDir / "scala-2", sourceDir / "scala-2.11")
@@ -106,8 +106,8 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
           Seq()
       }
     },
-    unmanagedSourceDirectories in Test ++= {
-      val testSourceDir = (sourceDirectory in Test).value
+    Test / unmanagedSourceDirectories ++= {
+      val testSourceDir = (Test / sourceDirectory).value
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, _)) =>
           Seq(testSourceDir / "scala-2")
diff --git a/project/build.properties b/project/build.properties
index 0b2e09c5..f0be67b9 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.7
+sbt.version=1.5.1
diff --git a/version.sbt b/version.sbt
index b8b4128c..5555eb10 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "7.0.0-SNAPSHOT"
+ThisBuild / version := "7.0.0-SNAPSHOT"