diff --git a/build.sbt b/build.sbt
index 87ffb3803..fe4da77d1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -52,7 +52,7 @@ ThisBuild / githubWorkflowAddedJobs ++= Seq(
     javas = List(Java8),
     scalas = List((ThisBuild / scalaVersion).value)))
 
-ThisBuild / tlBaseVersion := "1.16"
+ThisBuild / tlBaseVersion := "1.17"
 ThisBuild / tlMimaPreviousVersions ++= Set(
   // manually added because tags are not v-prefixed
   "1.14.0",
diff --git a/core/js/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala b/core/js/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
deleted file mode 100644
index 6743327e1..000000000
--- a/core/js/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.scalacheck.time
-
-/** Stub trait since ScalaJs does not have native support for java.time types. */
-private[scalacheck] trait JavaTimeArbitrary
diff --git a/core/js/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala b/core/js/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
deleted file mode 100644
index d27e278ba..000000000
--- a/core/js/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.scalacheck.time
-
-/** Stub trait since ScalaJs does not have native support for java.time types. */
-private[scalacheck] trait JavaTimeChoose
diff --git a/core/js/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala b/core/js/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
deleted file mode 100644
index 5d8cbfb9e..000000000
--- a/core/js/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.scalacheck.time
-
-/** Stub trait since ScalaJs does not have native support for java.time types. */
-private[scalacheck] trait JavaTimeCogen
diff --git a/core/js/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala b/core/js/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
deleted file mode 100644
index ca02c4738..000000000
--- a/core/js/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.scalacheck.time
-
-/** Stub trait since ScalaJs does not have native support for java.time types. */
-private[scalacheck] trait JavaTimeShrink
diff --git a/core/native/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala b/core/native/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
deleted file mode 100644
index 3fc80f03b..000000000
--- a/core/native/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.scalacheck.time
-
-/** Stub trait since Scala Native does not have native support for java.time types. */
-private[scalacheck] trait JavaTimeArbitrary
diff --git a/core/native/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala b/core/native/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
deleted file mode 100644
index 0aa01c623..000000000
--- a/core/native/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.scalacheck.time
-
-/** Stub trait since Scala Native does not have native support for java.time types. */
-private[scalacheck] trait JavaTimeChoose
diff --git a/core/native/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala b/core/native/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
deleted file mode 100644
index ddeb71f29..000000000
--- a/core/native/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.scalacheck.time
-
-/** Stub trait since Scala Native does not have native support for java.time types. */
-private[scalacheck] trait JavaTimeCogen
diff --git a/core/native/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala b/core/native/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
deleted file mode 100644
index d28ca4323..000000000
--- a/core/native/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.scalacheck.time
-
-/** Stub trait since Scala Native does not have native support for java.time types. */
-private[scalacheck] trait JavaTimeShrink
diff --git a/core/jvm/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
similarity index 100%
rename from core/jvm/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
rename to core/shared/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
diff --git a/core/jvm/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
similarity index 100%
rename from core/jvm/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
rename to core/shared/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
diff --git a/core/jvm/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
similarity index 100%
rename from core/jvm/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
rename to core/shared/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
diff --git a/core/jvm/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
similarity index 100%
rename from core/jvm/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
rename to core/shared/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala