From 2147fe6d65dce2d435edbf4949d3907d391d24cc Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Sat, 20 May 2023 11:03:49 -0400 Subject: [PATCH] Regenerate automated files/headers --- .github/workflows/ci.yml | 46 +++++++++++++------ .github/workflows/clean.yml | 2 +- .../benchmarks/HeadRoomBenchmark.scala | 2 +- .../format/testing/FieldTests.scala | 16 +++++++ .../main/scala/sauerkraut/annotations.scala | 2 +- .../core/internal/MacroHelper.scala | 16 +++++++ .../format/pb/streams/ProtoInputStream.scala | 2 +- .../format/pb/streams/ProtoOutputStream.scala | 2 +- .../format/pb/streams/ProtoSizeWriter.scala | 16 +++++++ .../format/pb/streams/ProtoWireSize.scala | 2 +- .../format/pb/streams/WireFormat.scala | 2 +- 11 files changed, 87 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69d5acd..4032da7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ name: Continuous Integration on: pull_request: - branches: ['*'] + branches: ['**'] push: - branches: ['*'] + branches: ['**'] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -22,8 +22,8 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.0.0] - java: [adopt@1.8, adopt@1.11] + scala: [3.2.2] + java: [temurin@1.8, temurin@1.11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -31,10 +31,19 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v10 + - name: Setup Java (temurin@1.8) + if: matrix.java == 'temurin@1.8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 1.8 + + - name: Setup Java (temurin@1.11) + if: matrix.java == 'temurin@1.11' + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 1.11 - name: Cache sbt uses: actions/cache@v2 @@ -57,12 +66,12 @@ jobs: publish: name: Publish Artifacts needs: [build] - if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master') + if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main') strategy: matrix: os: [ubuntu-latest] - scala: [3.0.0] - java: [adopt@1.8] + scala: [3.2.2] + java: [temurin@1.8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -70,10 +79,19 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v10 + - name: Setup Java (temurin@1.8) + if: matrix.java == 'temurin@1.8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 1.8 + + - name: Setup Java (temurin@1.11) + if: matrix.java == 'temurin@1.11' + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 1.11 - name: Cache sbt uses: actions/cache@v2 @@ -85,4 +103,4 @@ jobs: ~/.cache/coursier/v1 ~/AppData/Local/Coursier/Cache/v1 ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} \ No newline at end of file + key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index b535fcc..547aaa4 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -56,4 +56,4 @@ jobs: printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size ghapi -X DELETE $REPO/actions/artifacts/$id done - done \ No newline at end of file + done diff --git a/benchmarks/src/main/scala/sauerkraut/benchmarks/HeadRoomBenchmark.scala b/benchmarks/src/main/scala/sauerkraut/benchmarks/HeadRoomBenchmark.scala index 6f348a8..2898c39 100644 --- a/benchmarks/src/main/scala/sauerkraut/benchmarks/HeadRoomBenchmark.scala +++ b/benchmarks/src/main/scala/sauerkraut/benchmarks/HeadRoomBenchmark.scala @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google + * Copyright 2019 Google * * 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/compliance/src/main/scala/sauerkraut/format/testing/FieldTests.scala b/compliance/src/main/scala/sauerkraut/format/testing/FieldTests.scala index f573df7..c1513a4 100644 --- a/compliance/src/main/scala/sauerkraut/format/testing/FieldTests.scala +++ b/compliance/src/main/scala/sauerkraut/format/testing/FieldTests.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2019 Google + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package sauerkraut package format package testing diff --git a/core/src/main/scala/sauerkraut/annotations.scala b/core/src/main/scala/sauerkraut/annotations.scala index 867fef5..e89ac3a 100644 --- a/core/src/main/scala/sauerkraut/annotations.scala +++ b/core/src/main/scala/sauerkraut/annotations.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021 Google + * Copyright 2019 Google * * 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/sauerkraut/core/internal/MacroHelper.scala b/core/src/main/scala/sauerkraut/core/internal/MacroHelper.scala index ba9779c..9851211 100644 --- a/core/src/main/scala/sauerkraut/core/internal/MacroHelper.scala +++ b/core/src/main/scala/sauerkraut/core/internal/MacroHelper.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2019 Google + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package sauerkraut package core package internal diff --git a/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoInputStream.scala b/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoInputStream.scala index dfc285b..d86bdb4 100644 --- a/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoInputStream.scala +++ b/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoInputStream.scala @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google + * Copyright 2019 Google * * 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/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoOutputStream.scala b/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoOutputStream.scala index ef279b5..dcfd14c 100644 --- a/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoOutputStream.scala +++ b/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoOutputStream.scala @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google + * Copyright 2019 Google * * 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/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoSizeWriter.scala b/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoSizeWriter.scala index b95f836..b46ee53 100644 --- a/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoSizeWriter.scala +++ b/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoSizeWriter.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2019 Google + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package sauerkraut package format package pb diff --git a/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoWireSize.scala b/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoWireSize.scala index 211bc4f..3ed8f61 100644 --- a/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoWireSize.scala +++ b/pb/src/main/scala/sauerkraut/format/pb/streams/ProtoWireSize.scala @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google + * Copyright 2019 Google * * 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/pb/src/main/scala/sauerkraut/format/pb/streams/WireFormat.scala b/pb/src/main/scala/sauerkraut/format/pb/streams/WireFormat.scala index 9f5afe3..1cdfe96 100644 --- a/pb/src/main/scala/sauerkraut/format/pb/streams/WireFormat.scala +++ b/pb/src/main/scala/sauerkraut/format/pb/streams/WireFormat.scala @@ -1,5 +1,5 @@ /* - * Copyright 2020 Google + * Copyright 2019 Google * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.