Merge branch 'master' into update/sbt-scoverage-2.0.11

typelevel · Apr 18, 2024 · 79cb137 · 79cb137
2 parents bd312aa + 32d0004
commit 79cb137
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.12, 2.12.18, 3.3.0]
+        scala: [2.13.12, 2.12.19, 3.3.0]
         java: [temurin@8]
         project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
@@ -180,32 +180,32 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.18, rootJS)
+      - name: Download target directories (2.12.19, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJS
 
-      - name: Inflate target directories (2.12.18, rootJS)
+      - name: Inflate target directories (2.12.19, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.18, rootJVM)
+      - name: Download target directories (2.12.19, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootJVM
 
-      - name: Inflate target directories (2.12.18, rootJVM)
+      - name: Inflate target directories (2.12.19, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.18, rootNative)
+      - name: Download target directories (2.12.19, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.19-rootNative
 
-      - name: Inflate target directories (2.12.18, rootNative)
+      - name: Inflate target directories (2.12.19, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.17"
+version = "3.8.1"
 align.openParenCallSite = true
 align.openParenDefnSite = true
 maxColumn = 120

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-val Scala212 = "2.12.18"
+val Scala212 = "2.12.19"
 val Scala213 = "2.13.12"
 val Scala3Version = "3.3.0"
 

diff --git a/cats/js/src/main/scala/org/typelevel/paiges/Platform.scala b/cats/js/src/main/scala/org/typelevel/paiges/Platform.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cats/jvm/src/main/scala/org/typelevel/paiges/Platform.scala b/cats/jvm/src/main/scala/org/typelevel/paiges/Platform.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cats/native/src/main/scala/org/typelevel/paiges/Platform.scala b/cats/native/src/main/scala/org/typelevel/paiges/Platform.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cats/shared/src/main/scala/org/typelevel/paiges/CatsDocument.scala b/cats/shared/src/main/scala/org/typelevel/paiges/CatsDocument.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cats/shared/src/main/scala/org/typelevel/paiges/instances.scala b/cats/shared/src/main/scala/org/typelevel/paiges/instances.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cats/shared/src/test/scala/org/typelevel/paiges/LawTests.scala b/cats/shared/src/test/scala/org/typelevel/paiges/LawTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala-2.12-/org/typelevel/paiges/ScalaVersionCompat.scala b/core/src/main/scala-2.12-/org/typelevel/paiges/ScalaVersionCompat.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala-2.13+/org/typelevel/paiges/ScalaVersionCompat.scala b/core/src/main/scala-2.13+/org/typelevel/paiges/ScalaVersionCompat.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/org/typelevel/paiges/Chunk.scala b/core/src/main/scala/org/typelevel/paiges/Chunk.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/org/typelevel/paiges/Doc.scala b/core/src/main/scala/org/typelevel/paiges/Doc.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/org/typelevel/paiges/Document.scala b/core/src/main/scala/org/typelevel/paiges/Document.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/org/typelevel/paiges/Style.scala b/core/src/main/scala/org/typelevel/paiges/Style.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/org/typelevel/paiges/package.scala b/core/src/main/scala/org/typelevel/paiges/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/test/scala/org/typelevel/paiges/ColorTest.scala b/core/src/test/scala/org/typelevel/paiges/ColorTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/test/scala/org/typelevel/paiges/DocumentTests.scala b/core/src/test/scala/org/typelevel/paiges/DocumentTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/test/scala/org/typelevel/paiges/Generators.scala b/core/src/test/scala/org/typelevel/paiges/Generators.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/test/scala/org/typelevel/paiges/JsonTest.scala b/core/src/test/scala/org/typelevel/paiges/JsonTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/test/scala/org/typelevel/paiges/PaigesScalacheckTest.scala b/core/src/test/scala/org/typelevel/paiges/PaigesScalacheckTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/test/scala/org/typelevel/paiges/PaigesTest.scala b/core/src/test/scala/org/typelevel/paiges/PaigesTest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Typelevel
+ * Copyright 2024 Typelevel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.9.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")