Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-library-2.12.18
Browse files Browse the repository at this point in the history
  • Loading branch information
typelevel-steward[bot] committed Jun 8, 2023
2 parents d7987db + 70aa6f2 commit c23d415
Show file tree
Hide file tree
Showing 67 changed files with 312 additions and 309 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Header whitespace cleanup
b8564609df3c849b3a258a411e0de645d4e8c7a0
0b26b5e6dbcf3e6beeca806297f848f41dde899b
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions bench/src/main/scala/org/scalacheck/bench/GenBench.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
10 changes: 5 additions & 5 deletions core/js/src/main/scala/org/scalacheck/Platform.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions core/jvm/src/main/scala/org/scalacheck/Platform.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions core/jvm/src/test/scala/org/scalacheck/ChooseSpecification.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions core/jvm/src/test/scala/org/scalacheck/CogenSpecification.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions core/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions core/jvm/src/test/scala/org/scalacheck/TestAll.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions core/jvm/src/test/scala/org/scalacheck/TestSpecification.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions core/jvm/src/test/scala/org/scalacheck/examples/IntMapSpec.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions core/native/src/main/scala/org/scalacheck/Platform.scala
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit c23d415

Please sign in to comment.