From 2c85e85d177b13ee3a1f27d92a53cae7f46c8bc2 Mon Sep 17 00:00:00 2001 From: Jamie Willis Date: Tue, 9 Jan 2024 19:17:28 +0000 Subject: [PATCH] updated workflows and added header --- .github/workflows/ci.yml | 317 ++++++++++-------- .../parsley/cats/MonoidKForParsley.scala | 4 +- .../parsley/cats/MonoidKForParsley.scala | 4 +- .../parsley/cats/ApplicativeForParsley.scala | 4 +- .../scala/parsley/cats/DeferForParsley.scala | 4 +- .../cats/FunctorFilterForParsley.scala | 4 +- .../parsley/cats/FunctorForParsley.scala | 4 +- .../scala/parsley/cats/MonadForParsley.scala | 4 +- .../main/scala/parsley/cats/combinator.scala | 4 +- .../main/scala/parsley/cats/instances.scala | 4 +- .../main/scala/parsley/catsinstances.scala | 4 +- .../src/test/scala/parsley/ParsleyTest.scala | 4 +- .../test/scala/parsley/cats/CatsSuite.scala | 5 + .../scala/parsley/cats/CombinatorTests.scala | 4 +- 14 files changed, 219 insertions(+), 151 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd4ea9f..8013219 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,23 +15,31 @@ 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: [2.13.10, 2.12.17, 3.2.1] + scala: [2.13, 2.12, 3] java: [temurin@8, temurin@11, temurin@17] project: [rootJS, rootJVM, rootNative] exclude: + - scala: 2.12 + java: temurin@11 + - scala: 2.12 + java: temurin@17 + - scala: 3 + java: temurin@11 + - scala: 3 + java: temurin@17 - project: rootJS java: temurin@11 - project: rootJS @@ -41,75 +49,59 @@ jobs: - project: rootNative java: temurin@17 runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 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@v4 with: distribution: temurin java-version: 8 + cache: sbt - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 - with: - distribution: jdkfile - java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - - name: Download Java (temurin@11) - id: download-java-temurin-11 + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 + cache: sbt - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 - with: - distribution: jdkfile - java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} - - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.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@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - name: Check that workflows are up to date run: sbt githubWorkflowCheck + - name: Check headers + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll + - name: scalaJSLink if: matrix.project == 'rootJS' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult @@ -130,16 +122,16 @@ jobs: 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/master') - run: mkdir -p target .js/target parsley-cats/js/target .jvm/target .native/target parsley-cats/jvm/target parsley-cats/native/target project/target + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/staging/1.3') + run: mkdir -p parsley-cats/js/target parsley-cats/jvm/target parsley-cats/native/target project/target - name: Compress target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') - run: tar cf targets.tar target .js/target parsley-cats/js/target .jvm/target .native/target parsley-cats/jvm/target parsley-cats/native/target project/target + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/staging/1.3') + run: tar cf targets.tar parsley-cats/js/target parsley-cats/jvm/target parsley-cats/native/target project/target - name: Upload target directories - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') - uses: actions/upload-artifact@v3 + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/staging/1.3') + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar @@ -147,179 +139,226 @@ jobs: publish: name: Publish Artifacts needs: [build] - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master') + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/staging/1.3') strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 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@v4 with: distribution: temurin java-version: 8 + cache: sbt - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 - with: - distribution: jdkfile - java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - - name: Download Java (temurin@11) - id: download-java-temurin-11 + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 + cache: sbt - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 - with: - distribution: jdkfile - java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - - name: Download Java (temurin@17) - id: download-java-temurin-17 + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 + cache: sbt - - name: Setup Java (temurin@17) - if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 - with: - distribution: jdkfile - java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - - name: Cache sbt - uses: actions/cache@v3 + - name: Download target directories (2.13, rootJS) + uses: actions/download-artifact@v4 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 (2.13.10, rootJS) - uses: actions/download-artifact@v3 - with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS - - name: Inflate target directories (2.13.10, rootJS) + - name: Inflate target directories (2.13, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, rootJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM - - name: Inflate target directories (2.13.10, rootJVM) + - name: Inflate target directories (2.13, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, rootNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative - - name: Inflate target directories (2.13.10, rootNative) + - name: Inflate target directories (2.13, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rootJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS - - name: Inflate target directories (2.12.17, rootJS) + - name: Inflate target directories (2.12, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rootJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM - - name: Inflate target directories (2.12.17, rootJVM) + - name: Inflate target directories (2.12, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rootNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative - - name: Inflate target directories (2.12.17, rootNative) + - name: Inflate target directories (2.12, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.1, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rootJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS - - name: Inflate target directories (3.2.1, rootJS) + - name: Inflate target directories (3, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.1, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rootJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM - - name: Inflate target directories (3.2.1, rootJVM) + - name: Inflate target directories (3, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.1, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rootNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative - - name: Inflate target directories (3.2.1, rootNative) + - name: Inflate target directories (3, rootNative) run: | tar xf targets.tar rm targets.tar - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' - run: echo $PGP_SECRET | base64 -di | gpg --import + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + run: echo $PGP_SECRET | base64 -d -i - | 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_SECRET" | base64 -d -i - > /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 - run: sbt '++ ${{ matrix.scala }}' tlCiRelease + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} + run: sbt tlCiRelease + + dependency-submission: + name: Submit Dependencies + if: github.event_name != 'pull_request' + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v4 + 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 +update + + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v4 + 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 +update + + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 + if: matrix.java == 'temurin@17' + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: rootjs_2.13 rootjs_2.12 rootjs_3 rootjvm_2.13 rootjvm_2.12 rootjvm_3 rootnative_2.13 rootnative_2.12 rootnative_3 + configs-ignore: test scala-tool scala-doc-tool test-internal diff --git a/parsley-cats/shared/src/main/scala-2.12/parsley/cats/MonoidKForParsley.scala b/parsley-cats/shared/src/main/scala-2.12/parsley/cats/MonoidKForParsley.scala index 43c306d..df6876d 100644 --- a/parsley-cats/shared/src/main/scala-2.12/parsley/cats/MonoidKForParsley.scala +++ b/parsley-cats/shared/src/main/scala-2.12/parsley/cats/MonoidKForParsley.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2022 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala-2.13+/parsley/cats/MonoidKForParsley.scala b/parsley-cats/shared/src/main/scala-2.13+/parsley/cats/MonoidKForParsley.scala index ebac5f0..2dbf508 100644 --- a/parsley-cats/shared/src/main/scala-2.13+/parsley/cats/MonoidKForParsley.scala +++ b/parsley-cats/shared/src/main/scala-2.13+/parsley/cats/MonoidKForParsley.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2022 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala/parsley/cats/ApplicativeForParsley.scala b/parsley-cats/shared/src/main/scala/parsley/cats/ApplicativeForParsley.scala index 2674c28..f352017 100644 --- a/parsley-cats/shared/src/main/scala/parsley/cats/ApplicativeForParsley.scala +++ b/parsley-cats/shared/src/main/scala/parsley/cats/ApplicativeForParsley.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2022 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala/parsley/cats/DeferForParsley.scala b/parsley-cats/shared/src/main/scala/parsley/cats/DeferForParsley.scala index 0fedcd5..a55908a 100644 --- a/parsley-cats/shared/src/main/scala/parsley/cats/DeferForParsley.scala +++ b/parsley-cats/shared/src/main/scala/parsley/cats/DeferForParsley.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2022 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala/parsley/cats/FunctorFilterForParsley.scala b/parsley-cats/shared/src/main/scala/parsley/cats/FunctorFilterForParsley.scala index 2ebf022..0314b05 100644 --- a/parsley-cats/shared/src/main/scala/parsley/cats/FunctorFilterForParsley.scala +++ b/parsley-cats/shared/src/main/scala/parsley/cats/FunctorFilterForParsley.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2022 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala/parsley/cats/FunctorForParsley.scala b/parsley-cats/shared/src/main/scala/parsley/cats/FunctorForParsley.scala index 8170a4a..4364320 100644 --- a/parsley-cats/shared/src/main/scala/parsley/cats/FunctorForParsley.scala +++ b/parsley-cats/shared/src/main/scala/parsley/cats/FunctorForParsley.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2022 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala/parsley/cats/MonadForParsley.scala b/parsley-cats/shared/src/main/scala/parsley/cats/MonadForParsley.scala index 97ad50f..3c4e8fc 100644 --- a/parsley-cats/shared/src/main/scala/parsley/cats/MonadForParsley.scala +++ b/parsley-cats/shared/src/main/scala/parsley/cats/MonadForParsley.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2022 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala/parsley/cats/combinator.scala b/parsley-cats/shared/src/main/scala/parsley/cats/combinator.scala index 4197140..244fad5 100644 --- a/parsley-cats/shared/src/main/scala/parsley/cats/combinator.scala +++ b/parsley-cats/shared/src/main/scala/parsley/cats/combinator.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2023 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala/parsley/cats/instances.scala b/parsley-cats/shared/src/main/scala/parsley/cats/instances.scala index 48038d5..28e5cf6 100644 --- a/parsley-cats/shared/src/main/scala/parsley/cats/instances.scala +++ b/parsley-cats/shared/src/main/scala/parsley/cats/instances.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2023 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats diff --git a/parsley-cats/shared/src/main/scala/parsley/catsinstances.scala b/parsley-cats/shared/src/main/scala/parsley/catsinstances.scala index 95dca29..3127809 100644 --- a/parsley-cats/shared/src/main/scala/parsley/catsinstances.scala +++ b/parsley-cats/shared/src/main/scala/parsley/catsinstances.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2022 Parsley Cats Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley diff --git a/parsley-cats/shared/src/test/scala/parsley/ParsleyTest.scala b/parsley-cats/shared/src/test/scala/parsley/ParsleyTest.scala index 35f3c11..a6426cc 100644 --- a/parsley-cats/shared/src/test/scala/parsley/ParsleyTest.scala +++ b/parsley-cats/shared/src/test/scala/parsley/ParsleyTest.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2023 Parsley Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley diff --git a/parsley-cats/shared/src/test/scala/parsley/cats/CatsSuite.scala b/parsley-cats/shared/src/test/scala/parsley/cats/CatsSuite.scala index 17d2702..7efd77c 100644 --- a/parsley-cats/shared/src/test/scala/parsley/cats/CatsSuite.scala +++ b/parsley-cats/shared/src/test/scala/parsley/cats/CatsSuite.scala @@ -1,3 +1,8 @@ +/* + * Copyright 2022 Parsley-Cats Contributors + * + * SPDX-License-Identifier: BSD-3-Clause + */ package parsley.cats import org.scalatest.flatspec.AnyFlatSpec diff --git a/parsley-cats/shared/src/test/scala/parsley/cats/CombinatorTests.scala b/parsley-cats/shared/src/test/scala/parsley/cats/CombinatorTests.scala index 565fdf7..ebff00b 100644 --- a/parsley-cats/shared/src/test/scala/parsley/cats/CombinatorTests.scala +++ b/parsley-cats/shared/src/test/scala/parsley/cats/CombinatorTests.scala @@ -1,4 +1,6 @@ -/* SPDX-FileCopyrightText: © 2023 Parsley Contributors +/* + * Copyright 2022 Parsley-Cats Contributors + * * SPDX-License-Identifier: BSD-3-Clause */ package parsley.cats