diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..cb49a3d0
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,3 @@
+# Header whitespace cleanup
+b8564609df3c849b3a258a411e0de645d4e8c7a0
+0b26b5e6dbcf3e6beeca806297f848f41dde899b
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f029df0..191fdd1a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,12 +28,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.2.2, 2.12.17, 2.13.11]
+        scala: [3.3.0, 2.12.17, 2.13.11]
         java: [temurin@8, temurin@11]
         project: [rootJS, rootJVM, rootNative]
         workers: [1, 4]
         exclude:
-          - scala: 3.2.2
+          - scala: 3.3.0
             java: temurin@11
           - scala: 2.12.17
             java: temurin@11
@@ -196,32 +196,32 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (3.2.2, rootJS, 1)
+      - name: Download target directories (3.3.0, rootJS, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJS-1
 
-      - name: Inflate target directories (3.2.2, rootJS, 1)
+      - name: Inflate target directories (3.3.0, rootJS, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.2, rootJVM, 1)
+      - name: Download target directories (3.3.0, rootJVM, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJVM-1
 
-      - name: Inflate target directories (3.2.2, rootJVM, 1)
+      - name: Inflate target directories (3.3.0, rootJVM, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.2, rootNative, 1)
+      - name: Download target directories (3.3.0, rootNative, 1)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative-1
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNative-1
 
-      - name: Inflate target directories (3.2.2, rootNative, 1)
+      - name: Inflate target directories (3.3.0, rootNative, 1)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/bench/src/main/scala/org/scalacheck/bench/GenBench.scala b/bench/src/main/scala/org/scalacheck/bench/GenBench.scala
index e6f2e8ad..fe18ee34 100644
--- a/bench/src/main/scala/org/scalacheck/bench/GenBench.scala
+++ b/bench/src/main/scala/org/scalacheck/bench/GenBench.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.bench
diff --git a/build.sbt b/build.sbt
index b64ea179..a0453f09 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 val Scala212 = "2.12.17"
 val Scala213 = "2.13.11"
-val Scala3 = "3.2.2"
+val Scala3 = "3.3.0"
 
 name := "scalacheck"
 ThisBuild / organization := "org.scalacheck"
diff --git a/core/js/src/main/scala/org/scalacheck/Platform.scala b/core/js/src/main/scala/org/scalacheck/Platform.scala
index 24c579b9..80ed9441 100644
--- a/core/js/src/main/scala/org/scalacheck/Platform.scala
+++ b/core/js/src/main/scala/org/scalacheck/Platform.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/main/scala/org/scalacheck/Platform.scala b/core/jvm/src/main/scala/org/scalacheck/Platform.scala
index 44ef8068..a0242460 100644
--- a/core/jvm/src/main/scala/org/scalacheck/Platform.scala
+++ b/core/jvm/src/main/scala/org/scalacheck/Platform.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/ArbitrarySpecification.scala b/core/jvm/src/test/scala/org/scalacheck/ArbitrarySpecification.scala
index 5a88201e..4788652c 100644
--- a/core/jvm/src/test/scala/org/scalacheck/ArbitrarySpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/ArbitrarySpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/ChooseSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/ChooseSpecification.scala
index 89f7be52..5420b82c 100644
--- a/core/jvm/src/test/scala/org/scalacheck/ChooseSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/ChooseSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/CogenSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/CogenSpecification.scala
index af4b3f35..72e9c576 100644
--- a/core/jvm/src/test/scala/org/scalacheck/CogenSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/CogenSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/GenSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
index b860400d..06a612e7 100644
--- a/core/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/LazyPropertiesSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/LazyPropertiesSpecification.scala
index b69635e2..613a4db5 100644
--- a/core/jvm/src/test/scala/org/scalacheck/LazyPropertiesSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/LazyPropertiesSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/PropertyFilterSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/PropertyFilterSpecification.scala
index b8be6447..5cdb1ada 100644
--- a/core/jvm/src/test/scala/org/scalacheck/PropertyFilterSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/PropertyFilterSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/SerializabilitySpecification.scala b/core/jvm/src/test/scala/org/scalacheck/SerializabilitySpecification.scala
index b8e5a003..36454d6b 100644
--- a/core/jvm/src/test/scala/org/scalacheck/SerializabilitySpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/SerializabilitySpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/ShrinkSpecificationJVM.scala b/core/jvm/src/test/scala/org/scalacheck/ShrinkSpecificationJVM.scala
index 12d0bc24..4c667227 100644
--- a/core/jvm/src/test/scala/org/scalacheck/ShrinkSpecificationJVM.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/ShrinkSpecificationJVM.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/TestAll.scala b/core/jvm/src/test/scala/org/scalacheck/TestAll.scala
index c8a669b6..ae017e2d 100644
--- a/core/jvm/src/test/scala/org/scalacheck/TestAll.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/TestAll.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/TestSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/TestSpecification.scala
index 9cb2ca1e..bf22d684 100644
--- a/core/jvm/src/test/scala/org/scalacheck/TestSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/TestSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/commands/CommandsShrinkSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/commands/CommandsShrinkSpecification.scala
index 71bdb73b..460e6cf3 100644
--- a/core/jvm/src/test/scala/org/scalacheck/commands/CommandsShrinkSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/commands/CommandsShrinkSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.commands
diff --git a/core/jvm/src/test/scala/org/scalacheck/commands/CommandsSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/commands/CommandsSpecification.scala
index f9f99040..711c6002 100644
--- a/core/jvm/src/test/scala/org/scalacheck/commands/CommandsSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/commands/CommandsSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.commands
diff --git a/core/jvm/src/test/scala/org/scalacheck/examples/IntMapSpec.scala b/core/jvm/src/test/scala/org/scalacheck/examples/IntMapSpec.scala
index e8b26888..267792ad 100644
--- a/core/jvm/src/test/scala/org/scalacheck/examples/IntMapSpec.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/examples/IntMapSpec.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/examples/StringUtils.scala b/core/jvm/src/test/scala/org/scalacheck/examples/StringUtils.scala
index 4c3bbff4..b0a5002f 100644
--- a/core/jvm/src/test/scala/org/scalacheck/examples/StringUtils.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/examples/StringUtils.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.example
diff --git a/core/jvm/src/test/scala/org/scalacheck/rng/SeedSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/rng/SeedSpecification.scala
index cfebd4b5..6a3f9451 100644
--- a/core/jvm/src/test/scala/org/scalacheck/rng/SeedSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/rng/SeedSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/jvm/src/test/scala/org/scalacheck/time/ShrinkSpecification.scala b/core/jvm/src/test/scala/org/scalacheck/time/ShrinkSpecification.scala
index 269d619d..c773f09d 100644
--- a/core/jvm/src/test/scala/org/scalacheck/time/ShrinkSpecification.scala
+++ b/core/jvm/src/test/scala/org/scalacheck/time/ShrinkSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.time
diff --git a/core/native/src/main/scala/org/scalacheck/Platform.scala b/core/native/src/main/scala/org/scalacheck/Platform.scala
index 8e413230..0b49dcfa 100644
--- a/core/native/src/main/scala/org/scalacheck/Platform.scala
+++ b/core/native/src/main/scala/org/scalacheck/Platform.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala-2.12-/org/scalacheck/ScalaVersionSpecific.scala b/core/shared/src/main/scala-2.12-/org/scalacheck/ScalaVersionSpecific.scala
index 2877297e..bd59d048 100644
--- a/core/shared/src/main/scala-2.12-/org/scalacheck/ScalaVersionSpecific.scala
+++ b/core/shared/src/main/scala-2.12-/org/scalacheck/ScalaVersionSpecific.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala-2.12-/org/scalacheck/util/BuildableVersionSpecific.scala b/core/shared/src/main/scala-2.12-/org/scalacheck/util/BuildableVersionSpecific.scala
index b19277c8..ad16c272 100644
--- a/core/shared/src/main/scala-2.12-/org/scalacheck/util/BuildableVersionSpecific.scala
+++ b/core/shared/src/main/scala-2.12-/org/scalacheck/util/BuildableVersionSpecific.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.util
diff --git a/core/shared/src/main/scala-2.13+/org/scalacheck/ScalaVersionSpecific.scala b/core/shared/src/main/scala-2.13+/org/scalacheck/ScalaVersionSpecific.scala
index 9be73cf8..e3c96d8b 100644
--- a/core/shared/src/main/scala-2.13+/org/scalacheck/ScalaVersionSpecific.scala
+++ b/core/shared/src/main/scala-2.13+/org/scalacheck/ScalaVersionSpecific.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala-2.13+/org/scalacheck/util/BuildableVersionSpecific.scala b/core/shared/src/main/scala-2.13+/org/scalacheck/util/BuildableVersionSpecific.scala
index ffa936ff..f70d7ce8 100644
--- a/core/shared/src/main/scala-2.13+/org/scalacheck/util/BuildableVersionSpecific.scala
+++ b/core/shared/src/main/scala-2.13+/org/scalacheck/util/BuildableVersionSpecific.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.util
diff --git a/core/shared/src/main/scala/org/scalacheck/Arbitrary.scala b/core/shared/src/main/scala/org/scalacheck/Arbitrary.scala
index 9ad8afe9..98b8625b 100644
--- a/core/shared/src/main/scala/org/scalacheck/Arbitrary.scala
+++ b/core/shared/src/main/scala/org/scalacheck/Arbitrary.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/Cogen.scala b/core/shared/src/main/scala/org/scalacheck/Cogen.scala
index b4dffc85..4af7a93a 100644
--- a/core/shared/src/main/scala/org/scalacheck/Cogen.scala
+++ b/core/shared/src/main/scala/org/scalacheck/Cogen.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/Gen.scala b/core/shared/src/main/scala/org/scalacheck/Gen.scala
index a7003f8a..94f2cd84 100644
--- a/core/shared/src/main/scala/org/scalacheck/Gen.scala
+++ b/core/shared/src/main/scala/org/scalacheck/Gen.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/Prop.scala b/core/shared/src/main/scala/org/scalacheck/Prop.scala
index 3815da91..08cc3b0d 100644
--- a/core/shared/src/main/scala/org/scalacheck/Prop.scala
+++ b/core/shared/src/main/scala/org/scalacheck/Prop.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/Properties.scala b/core/shared/src/main/scala/org/scalacheck/Properties.scala
index cf0282c7..7ed17cb4 100644
--- a/core/shared/src/main/scala/org/scalacheck/Properties.scala
+++ b/core/shared/src/main/scala/org/scalacheck/Properties.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala b/core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
index 177072fa..9f19ae57 100644
--- a/core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
+++ b/core/shared/src/main/scala/org/scalacheck/ScalaCheckFramework.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/Shrink.scala b/core/shared/src/main/scala/org/scalacheck/Shrink.scala
index 41d532eb..4bf86b25 100644
--- a/core/shared/src/main/scala/org/scalacheck/Shrink.scala
+++ b/core/shared/src/main/scala/org/scalacheck/Shrink.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/Test.scala b/core/shared/src/main/scala/org/scalacheck/Test.scala
index 0a8699c8..dd8c3c07 100644
--- a/core/shared/src/main/scala/org/scalacheck/Test.scala
+++ b/core/shared/src/main/scala/org/scalacheck/Test.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/commands/Commands.scala b/core/shared/src/main/scala/org/scalacheck/commands/Commands.scala
index ac27b789..8ef55766 100644
--- a/core/shared/src/main/scala/org/scalacheck/commands/Commands.scala
+++ b/core/shared/src/main/scala/org/scalacheck/commands/Commands.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.commands
diff --git a/core/shared/src/main/scala/org/scalacheck/rng/Seed.scala b/core/shared/src/main/scala/org/scalacheck/rng/Seed.scala
index f305d00f..8632fd9f 100644
--- a/core/shared/src/main/scala/org/scalacheck/rng/Seed.scala
+++ b/core/shared/src/main/scala/org/scalacheck/rng/Seed.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
index 48a98a78..d6493e86 100644
--- a/core/shared/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
+++ b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeArbitrary.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.time
diff --git a/core/shared/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
index 322e9e37..8b2afc47 100644
--- a/core/shared/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
+++ b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeChoose.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.time
diff --git a/core/shared/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
index b5ea3b4c..e8e38c99 100644
--- a/core/shared/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
+++ b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeCogen.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.time
diff --git a/core/shared/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
index 79ac4b80..0b20555e 100644
--- a/core/shared/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
+++ b/core/shared/src/main/scala/org/scalacheck/time/JavaTimeShrink.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.time
diff --git a/core/shared/src/main/scala/org/scalacheck/util/Buildable.scala b/core/shared/src/main/scala/org/scalacheck/util/Buildable.scala
index f617718b..bcb4cb86 100644
--- a/core/shared/src/main/scala/org/scalacheck/util/Buildable.scala
+++ b/core/shared/src/main/scala/org/scalacheck/util/Buildable.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.util
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 a54d2fce..d6309db1 100644
--- a/core/shared/src/main/scala/org/scalacheck/util/CmdLineParser.scala
+++ b/core/shared/src/main/scala/org/scalacheck/util/CmdLineParser.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.util
diff --git a/core/shared/src/main/scala/org/scalacheck/util/ConsoleReporter.scala b/core/shared/src/main/scala/org/scalacheck/util/ConsoleReporter.scala
index e3dda4b9..a2b582a4 100644
--- a/core/shared/src/main/scala/org/scalacheck/util/ConsoleReporter.scala
+++ b/core/shared/src/main/scala/org/scalacheck/util/ConsoleReporter.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.util
diff --git a/core/shared/src/main/scala/org/scalacheck/util/FreqMap.scala b/core/shared/src/main/scala/org/scalacheck/util/FreqMap.scala
index 1be5c3dd..4f697544 100644
--- a/core/shared/src/main/scala/org/scalacheck/util/FreqMap.scala
+++ b/core/shared/src/main/scala/org/scalacheck/util/FreqMap.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.util
diff --git a/core/shared/src/main/scala/org/scalacheck/util/Pretty.scala b/core/shared/src/main/scala/org/scalacheck/util/Pretty.scala
index e58dfcd8..c679bc2d 100644
--- a/core/shared/src/main/scala/org/scalacheck/util/Pretty.scala
+++ b/core/shared/src/main/scala/org/scalacheck/util/Pretty.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.util
diff --git a/core/shared/src/test/scala-2.12-/org/scalacheck/time/OrderingVersionSpecific.scala b/core/shared/src/test/scala-2.12-/org/scalacheck/time/OrderingVersionSpecific.scala
index 7be3df13..7f867b1a 100644
--- a/core/shared/src/test/scala-2.12-/org/scalacheck/time/OrderingVersionSpecific.scala
+++ b/core/shared/src/test/scala-2.12-/org/scalacheck/time/OrderingVersionSpecific.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.time
diff --git a/core/shared/src/test/scala-2.13+/org/scalacheck/time/OrderingVersionSpecific.scala b/core/shared/src/test/scala-2.13+/org/scalacheck/time/OrderingVersionSpecific.scala
index c80e210a..78fbfc96 100644
--- a/core/shared/src/test/scala-2.13+/org/scalacheck/time/OrderingVersionSpecific.scala
+++ b/core/shared/src/test/scala-2.13+/org/scalacheck/time/OrderingVersionSpecific.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.time
diff --git a/core/shared/src/test/scala/org/scalacheck/NoPropertyNestingSpecification.scala b/core/shared/src/test/scala/org/scalacheck/NoPropertyNestingSpecification.scala
index c1f4d45c..2dc73df6 100644
--- a/core/shared/src/test/scala/org/scalacheck/NoPropertyNestingSpecification.scala
+++ b/core/shared/src/test/scala/org/scalacheck/NoPropertyNestingSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/test/scala/org/scalacheck/PropSpecification.scala b/core/shared/src/test/scala/org/scalacheck/PropSpecification.scala
index 87b83687..06f7b852 100644
--- a/core/shared/src/test/scala/org/scalacheck/PropSpecification.scala
+++ b/core/shared/src/test/scala/org/scalacheck/PropSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/test/scala/org/scalacheck/ShrinkSpecification.scala b/core/shared/src/test/scala/org/scalacheck/ShrinkSpecification.scala
index 6182e8ea..cd222c41 100644
--- a/core/shared/src/test/scala/org/scalacheck/ShrinkSpecification.scala
+++ b/core/shared/src/test/scala/org/scalacheck/ShrinkSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/test/scala/org/scalacheck/StatsSpecification.scala b/core/shared/src/test/scala/org/scalacheck/StatsSpecification.scala
index 97906c2e..0a214693 100644
--- a/core/shared/src/test/scala/org/scalacheck/StatsSpecification.scala
+++ b/core/shared/src/test/scala/org/scalacheck/StatsSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/test/scala/org/scalacheck/TestFingerprint.scala b/core/shared/src/test/scala/org/scalacheck/TestFingerprint.scala
index 561423bf..58f7fc50 100644
--- a/core/shared/src/test/scala/org/scalacheck/TestFingerprint.scala
+++ b/core/shared/src/test/scala/org/scalacheck/TestFingerprint.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/test/scala/org/scalacheck/examples/Examples.scala b/core/shared/src/test/scala/org/scalacheck/examples/Examples.scala
index 6df559dd..06662d45 100644
--- a/core/shared/src/test/scala/org/scalacheck/examples/Examples.scala
+++ b/core/shared/src/test/scala/org/scalacheck/examples/Examples.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.examples
diff --git a/core/shared/src/test/scala/org/scalacheck/examples/MathSpec.scala b/core/shared/src/test/scala/org/scalacheck/examples/MathSpec.scala
index 827ef31e..e021b101 100644
--- a/core/shared/src/test/scala/org/scalacheck/examples/MathSpec.scala
+++ b/core/shared/src/test/scala/org/scalacheck/examples/MathSpec.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck.examples
diff --git a/core/shared/src/test/scala/org/scalacheck/util/BuildableSpecification.scala b/core/shared/src/test/scala/org/scalacheck/util/BuildableSpecification.scala
index 3d224f76..7799469a 100644
--- a/core/shared/src/test/scala/org/scalacheck/util/BuildableSpecification.scala
+++ b/core/shared/src/test/scala/org/scalacheck/util/BuildableSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/test/scala/org/scalacheck/util/PrettySpecification.scala b/core/shared/src/test/scala/org/scalacheck/util/PrettySpecification.scala
index ffdd78db..f5e5404d 100644
--- a/core/shared/src/test/scala/org/scalacheck/util/PrettySpecification.scala
+++ b/core/shared/src/test/scala/org/scalacheck/util/PrettySpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package org.scalacheck
diff --git a/core/shared/src/test/scala/scala/StringSpecification.scala b/core/shared/src/test/scala/scala/StringSpecification.scala
index 6a341d54..078a7126 100644
--- a/core/shared/src/test/scala/scala/StringSpecification.scala
+++ b/core/shared/src/test/scala/scala/StringSpecification.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 package scala
diff --git a/examples/commands-leveldb/project/build.properties b/examples/commands-leveldb/project/build.properties
index 72413de1..40b3b8e7 100644
--- a/examples/commands-leveldb/project/build.properties
+++ b/examples/commands-leveldb/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
diff --git a/examples/commands-nix/project/build.properties b/examples/commands-nix/project/build.properties
index 72413de1..40b3b8e7 100644
--- a/examples/commands-nix/project/build.properties
+++ b/examples/commands-nix/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
diff --git a/examples/commands-redis/project/build.properties b/examples/commands-redis/project/build.properties
index 72413de1..40b3b8e7 100644
--- a/examples/commands-redis/project/build.properties
+++ b/examples/commands-redis/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
diff --git a/examples/scalajs/project/build.properties b/examples/scalajs/project/build.properties
index 72413de1..40b3b8e7 100644
--- a/examples/scalajs/project/build.properties
+++ b/examples/scalajs/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
diff --git a/examples/simple-sbt/project/build.properties b/examples/simple-sbt/project/build.properties
index 72413de1..40b3b8e7 100644
--- a/examples/simple-sbt/project/build.properties
+++ b/examples/simple-sbt/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
diff --git a/project/CustomHeaderPlugin.scala b/project/CustomHeaderPlugin.scala
index 4407c982..59d65caf 100644
--- a/project/CustomHeaderPlugin.scala
+++ b/project/CustomHeaderPlugin.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 import sbt.*
@@ -21,11 +21,11 @@ object CustomHeaderPlugin extends AutoPlugin {
   )
 
   private[this] final val licenseTest =
-    """|ScalaCheck                                                           
-       |Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
-       |http://www.scalacheck.org                                            
-       |                                                                     
+    """|ScalaCheck
+       |Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+       |http://www.scalacheck.org
+       |
        |This software is released under the terms of the Revised BSD License.
-       |There is NO WARRANTY. See the file LICENSE for the full text.        
+       |There is NO WARRANTY. See the file LICENSE for the full text.
        |""".stripMargin
 }
diff --git a/project/build.properties b/project/build.properties
index 72413de1..40b3b8e7 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
diff --git a/project/codegen.scala b/project/codegen.scala
index 74a46b43..63f68003 100644
--- a/project/codegen.scala
+++ b/project/codegen.scala
@@ -1,10 +1,10 @@
 /*
- * ScalaCheck                                                           
- * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.        
- * http://www.scalacheck.org                                            
- *                                                                      
+ * ScalaCheck
+ * Copyright (c) 2007-2021 Rickard Nilsson. All rights reserved.
+ * http://www.scalacheck.org
+ *
  * This software is released under the terms of the Revised BSD License.
- * There is NO WARRANTY. See the file LICENSE for the full text.        
+ * There is NO WARRANTY. See the file LICENSE for the full text.
  */
 
 // Generates Arbitrary instance for tuples and functions
diff --git a/project/plugin.sbt b/project/plugin.sbt
index f168ddf3..37e72c3c 100644
--- a/project/plugin.sbt
+++ b/project/plugin.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12")
+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")