diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e81bddd..b8b26439 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,27 +15,27 @@ on:
     tags: [v*]
 
 env:
-  PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-  SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
-  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-  PGP_SECRET: ${{ secrets.PGP_SECRET }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.0, 2.12.18, 2.13.11]
+        scala: [3, 2.12, 2.13]
         java: [temurin@8, temurin@11]
         project: [rootJS, rootJVM, rootNative]
         workers: [1, 4]
         exclude:
-          - scala: 3.3.0
+          - scala: 3
             java: temurin@11
-          - scala: 2.12.18
+          - scala: 2.12
             java: temurin@11
           - project: rootJS
             java: temurin@11
@@ -46,61 +46,44 @@ jobs:
           - project: rootNative
             workers: 4
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Download Java (temurin@11)
-        id: download-java-temurin-11
-        if: matrix.java == 'temurin@11'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update
 
       - name: Setup Java (temurin@11)
+        id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 11
-          jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' && matrix.workers == '1'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: scalaJSLink
@@ -115,20 +98,20 @@ jobs:
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' && matrix.workers == '1'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' && matrix.workers == '1'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p target .js/target core/native/target core/js/target core/jvm/target .jvm/target .native/target bench/target project/target
+        run: mkdir -p core/native/target core/js/target core/jvm/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar target .js/target core/native/target core/js/target core/jvm/target .jvm/target .native/target bench/target project/target
+        run: tar cf targets.tar core/native/target core/js/target core/jvm/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -152,160 +135,152 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Download Java (temurin@11)
-        id: download-java-temurin-11
-        if: matrix.java == 'temurin@11'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt reload +update
 
       - name: Setup Java (temurin@11)
+        id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 11
-          jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (3.3.0, rootJS, 1)
+      - name: sbt update
+        if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
+        run: sbt reload +update
+
+      - name: Download target directories (3, rootJS, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJS-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS-1
 
-      - name: Inflate target directories (3.3.0, rootJS, 1)
+      - name: Inflate target directories (3, rootJS, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0, rootJVM, 1)
+      - name: Download target directories (3, rootJVM, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJVM-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM-1
 
-      - name: Inflate target directories (3.3.0, rootJVM, 1)
+      - name: Inflate target directories (3, rootJVM, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0, rootNative, 1)
+      - name: Download target directories (3, rootNative, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNative-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative-1
 
-      - name: Inflate target directories (3.3.0, rootNative, 1)
+      - name: Inflate target directories (3, rootNative, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.18, rootJS, 1)
+      - name: Download target directories (2.12, rootJS, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJS-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS-1
 
-      - name: Inflate target directories (2.12.18, rootJS, 1)
+      - name: Inflate target directories (2.12, rootJS, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.18, rootJVM, 1)
+      - name: Download target directories (2.12, rootJVM, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM-1
 
-      - name: Inflate target directories (2.12.18, rootJVM, 1)
+      - name: Inflate target directories (2.12, rootJVM, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.18, rootNative, 1)
+      - name: Download target directories (2.12, rootNative, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootNative-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative-1
 
-      - name: Inflate target directories (2.12.18, rootNative, 1)
+      - name: Inflate target directories (2.12, rootNative, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11, rootJS, 1)
+      - name: Download target directories (2.13, rootJS, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJS-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS-1
 
-      - name: Inflate target directories (2.13.11, rootJS, 1)
+      - name: Inflate target directories (2.13, rootJS, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11, rootJVM, 1)
+      - name: Download target directories (2.13, rootJVM, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJVM-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM-1
 
-      - name: Inflate target directories (2.13.11, rootJVM, 1)
+      - name: Inflate target directories (2.13, rootJVM, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11, rootNative, 1)
+      - name: Download target directories (2.13, rootNative, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootNative-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative-1
 
-      - name: Inflate target directories (2.13.11, rootNative, 1)
+      - name: Inflate target directories (2.13, rootNative, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: echo $PGP_SECRET | base64 -di | gpg --import
 
       - name: Import signing key and strip passphrase
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
           echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg
           echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
           (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
 
       - name: Publish
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
         run: sbt tlCiRelease
 
-  examples:
-    name: Examples
+  dependency-submission:
+    name: Submit Dependencies
+    if: github.event_name != 'pull_request'
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.11]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -314,49 +289,76 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
+      - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 8
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
+
+      - name: Setup Java (temurin@11)
+        id: setup-java-temurin-11
+        if: matrix.java == 'temurin@11'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
+
+      - name: Submit Dependencies
+        uses: scalacenter/sbt-dependency-submission@v2
+        with:
+          modules-ignore: root rootJS rootJVM rootNative bench
+          configs-ignore: test scala-tool scala-doc-tool
+
+  examples:
+    name: Examples
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [temurin@8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Download Java (temurin@11)
-        id: download-java-temurin-11
-        if: matrix.java == 'temurin@11'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
 
       - name: Setup Java (temurin@11)
+        id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 11
-          jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
 
       - name: Build examples
         run: |
@@ -368,7 +370,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.11]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -377,49 +378,31 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Download Java (temurin@11)
-        id: download-java-temurin-11
-        if: matrix.java == 'temurin@11'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
 
       - name: Setup Java (temurin@11)
+        id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 11
-          jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
+        run: sbt '++ ${{ matrix.scala }}' reload +update
 
       - name: Build benchmark suite
         run: 'sbt ''++ ${{ matrix.scala }}'' ''bench/jmh:run -p genSize=0 -p seedCount=0 -bs 1 -wi 0 -i 1 -f 0 -t 1 -r 0 org.scalacheck.bench.GenBench'''
diff --git a/build.sbt b/build.sbt
index 6192f634..84a1d28e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -40,7 +40,7 @@ ThisBuild / githubWorkflowAddedJobs ++= Seq(
           "for d in */ ; do cd \"$d\" && sbt test:compile && cd ../ ; done"),
         name = Some("Build examples"))),
     javas = List(Java8),
-    scalas = List((ThisBuild / scalaVersion).value)
+    scalas = Nil
   ),
   WorkflowJob(
     "bench",
@@ -50,7 +50,7 @@ ThisBuild / githubWorkflowAddedJobs ++= Seq(
         List("bench/jmh:run -p genSize=0 -p seedCount=0 -bs 1 -wi 0 -i 1 -f 0 -t 1 -r 0 org.scalacheck.bench.GenBench"),
         name = Some("Build benchmark suite"))),
     javas = List(Java8),
-    scalas = List((ThisBuild / scalaVersion).value)
+    scalas = Nil
   )
 )
 
diff --git a/core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala b/core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
index 4b456937..f3894682 100644
--- a/core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
+++ b/core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
@@ -47,13 +47,15 @@ private abstract class ScalaCheckRunner extends Runner {
   protected def sbtSetup(loader: ClassLoader): Parameters => Parameters =
     _.withTestCallback(new Test.TestCallback {}).withCustomClassLoader(Some(loader))
 
-  abstract class BaseTask(override val taskDef: TaskDef) extends Task {
-    val tags: Array[String] = Array()
+  abstract class BaseTask(_taskDef: TaskDef) extends Task {
+    def taskDef() = _taskDef
+
+    def tags(): Array[String] = Array.empty
 
     val loaded: Either[Prop, Properties] = {
-      val fp = taskDef.fingerprint().asInstanceOf[SubclassFingerprint]
-      val obj = if (fp.isModule()) Platform.loadModule(taskDef.fullyQualifiedName(), loader)
-      else Platform.newInstance(taskDef.fullyQualifiedName(), loader, Seq())(Seq())
+      val fp = taskDef().fingerprint().asInstanceOf[SubclassFingerprint]
+      val obj = if (fp.isModule()) Platform.loadModule(taskDef().fullyQualifiedName(), loader)
+      else Platform.newInstance(taskDef().fullyQualifiedName(), loader, Seq())(Seq())
       obj match {
         case props: Properties => Right(props)
         case prop: Prop => Left(prop)
@@ -108,7 +110,7 @@ private abstract class ScalaCheckRunner extends Runner {
 
       if (single) {
         val mprops: Map[String, Prop] = props.toMap
-        self.taskDef.selectors().foreach {
+        self.taskDef().selectors().foreach {
           case ts: TestSelector =>
             val name = ts.testName()
             mprops.get(name).foreach { prop =>
@@ -138,29 +140,29 @@ private abstract class ScalaCheckRunner extends Runner {
         val result = Test.check(params, prop)
 
         val event = new Event {
-          val status = result.status match {
+          def status() = result.status match {
             case Test.Passed => Status.Success
             case _: Test.Proved => Status.Success
             case _: Test.Failed => Status.Failure
             case Test.Exhausted => Status.Failure
             case _: Test.PropException => Status.Error
           }
-          val throwable = result.status match {
+          def throwable() = result.status match {
             case Test.PropException(_, e, _) => new OptionalThrowable(e)
             case _: Test.Failed => new OptionalThrowable(
                 new Exception(pretty(result, Params(0)))
               )
             case _ => new OptionalThrowable()
           }
-          val fullyQualifiedName = self.taskDef.fullyQualifiedName()
-          val selector = new TestSelector(name)
-          val fingerprint = self.taskDef.fingerprint()
-          val duration = -1L
+          def fullyQualifiedName() = self.taskDef().fullyQualifiedName()
+          def selector() = new TestSelector(name)
+          def fingerprint() = self.taskDef().fingerprint()
+          def duration() = -1L
         }
 
         handler.handle(event)
 
-        event.status match {
+        event.status() match {
           case Status.Success => successCount.incrementAndGet()
           case Status.Error => errorCount.incrementAndGet()
           case Status.Skipped => errorCount.incrementAndGet()
@@ -175,7 +177,7 @@ private abstract class ScalaCheckRunner extends Runner {
           args.grouped(2).filter(twos => verbosityOpts(twos.head))
             .toSeq.headOption.map(_.last).map(_.toInt).getOrElse(0)
         val s = if (result.passed) "+" else "!"
-        val n = if (name.isEmpty) self.taskDef.fullyQualifiedName() else name
+        val n = if (name.isEmpty) self.taskDef().fullyQualifiedName() else name
         val logMsg = s"$s $n: ${pretty(result, Params(verbosity))}"
         log(loggers, result.passed, logMsg)
       }
@@ -188,11 +190,11 @@ final class ScalaCheckFramework extends Framework {
   private def mkFP(mod: Boolean, cname: String, noArgCons: Boolean = true) =
     new SubclassFingerprint {
       def superclassName(): String = cname
-      val isModule = mod
+      def isModule() = mod
       def requireNoArgConstructor(): Boolean = noArgCons
     }
 
-  override val name: String = "ScalaCheck"
+  override def name(): String = "ScalaCheck"
 
   override def fingerprints(): Array[Fingerprint] = Array(
     mkFP(false, "org.scalacheck.Properties"),
@@ -205,7 +207,7 @@ final class ScalaCheckFramework extends Framework {
     new ScalaCheckRunner {
 
       val args = _args
-      val remoteArgs = _remoteArgs
+      def remoteArgs() = _remoteArgs
       val loader = _loader
       val (prms, unknownArgs) = Test.CmdLineParser.parseParams(args)
       val applyCmdParams = prms.andThen(sbtSetup(loader))
@@ -238,7 +240,7 @@ final class ScalaCheckFramework extends Framework {
       send: String => Unit
   ): _root_.sbt.testing.Runner = new ScalaCheckRunner {
     val args = _args
-    val remoteArgs = _remoteArgs
+    def remoteArgs() = _remoteArgs
     val loader = _loader
 
     val (prms, unknownArgs) = Test.CmdLineParser.parseParams(args)
diff --git a/core/shared/src/main/scala/org/scalacheck/Test.scala b/core/shared/src/main/scala/org/scalacheck/Test.scala
index 3562bd5f..716cf87b 100644
--- a/core/shared/src/main/scala/org/scalacheck/Test.scala
+++ b/core/shared/src/main/scala/org/scalacheck/Test.scala
@@ -313,12 +313,12 @@ object Test {
   private[scalacheck] object CmdLineParser extends CmdLineParser {
     object OptMinSuccess extends IntOpt {
       val default = Parameters.default.minSuccessfulTests
-      val names = Set("minSuccessfulTests", "s")
+      val names: Set[String] = Set("minSuccessfulTests", "s")
       val help = "Number of tests that must succeed in order to pass a property"
     }
     object OptMaxDiscardRatio extends FloatOpt {
       val default = Parameters.default.maxDiscardRatio
-      val names = Set("maxDiscardRatio", "r")
+      val names: Set[String] = Set("maxDiscardRatio", "r")
       val help =
         "The maximum ratio between discarded and succeeded tests " +
           "allowed before ScalaCheck stops testing a property. At " +
@@ -326,46 +326,46 @@ object Test {
     }
     object OptMinSize extends IntOpt {
       val default = Parameters.default.minSize
-      val names = Set("minSize", "n")
+      val names: Set[String] = Set("minSize", "n")
       val help = "Minimum data generation size"
     }
     object OptMaxSize extends IntOpt {
       val default = Parameters.default.maxSize
-      val names = Set("maxSize", "x")
+      val names: Set[String] = Set("maxSize", "x")
       val help = "Maximum data generation size"
     }
     object OptWorkers extends IntOpt {
       val default = Parameters.default.workers
-      val names = Set("workers", "w")
+      val names: Set[String] = Set("workers", "w")
       val help = "Number of threads to execute in parallel for testing"
     }
     object OptVerbosity extends IntOpt {
       val default = 1
-      val names = Set("verbosity", "v")
+      val names: Set[String] = Set("verbosity", "v")
       val help = "Verbosity level"
     }
 
-    object OptPropFilter extends OpStrOpt {
-      val default = Parameters.default.propFilter
-      val names = Set("propFilter", "f")
+    object OptPropFilter extends OpStrOptCompat {
+      override val default = Parameters.default.propFilter
+      val names: Set[String] = Set("propFilter", "f")
       val help = "Regular expression to filter properties on"
     }
 
-    object OptInitialSeed extends OpStrOpt {
-      val default = None
-      val names = Set("initialSeed")
+    object OptInitialSeed extends OpStrOptCompat {
+      override val default: None.type = None
+      val names: Set[String] = Set("initialSeed")
       val help = "Use Base-64 seed for all properties"
     }
 
     object OptDisableLegacyShrinking extends Flag {
       val default = ()
-      val names = Set("disableLegacyShrinking")
+      val names: Set[String] = Set("disableLegacyShrinking")
       val help = "Disable legacy shrinking using Shrink instances"
     }
 
     object OptMaxRNGSpins extends IntOpt {
       val default = 1
-      val names = Set("maxRNGSpins")
+      val names: Set[String] = Set("maxRNGSpins")
       val help = "Maximum number of RNG spins to perform between checks"
     }
 
diff --git a/core/shared/src/main/scala/org/scalacheck/util/CmdLineParser.scala b/core/shared/src/main/scala/org/scalacheck/util/CmdLineParser.scala
index a6a03491..25639696 100644
--- a/core/shared/src/main/scala/org/scalacheck/util/CmdLineParser.scala
+++ b/core/shared/src/main/scala/org/scalacheck/util/CmdLineParser.scala
@@ -23,6 +23,9 @@ private[scalacheck] trait CmdLineParser {
   trait FloatOpt extends Opt[Float]
   trait StrOpt extends Opt[String]
   trait OpStrOpt extends Opt[Option[String]]
+  private[scalacheck] abstract class OpStrOptCompat extends OpStrOpt {
+    val default: Option[String] = None
+  }
 
   class OptMap(private val opts: Map[Opt[_], Any] = Map.empty) {
     def apply(flag: Flag): Boolean = opts.contains(flag)
diff --git a/project/plugin.sbt b/project/plugin.sbt
index 37e72c3c..01d6c761 100644
--- a/project/plugin.sbt
+++ b/project/plugin.sbt
@@ -1,6 +1,4 @@
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
-addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC1")