From 2329f8303008b7bbf1d70e7707aaa622c4914c2c Mon Sep 17 00:00:00 2001 From: yunion Date: Wed, 24 Jan 2024 19:39:43 -0500 Subject: [PATCH] update ci --- .github/workflows/ci.yml | 112 +++++++++++++++--- .github/workflows/clean.yml | 3 +- .../HttpProtocolCompliance.scala | 2 +- .../ProtocolComplianceSuite.scala | 6 +- .../internals/CanonicalSmithyDecoder.scala | 10 +- .../ClientHttpComplianceTestCase.scala | 8 +- .../internals/DefaultSchemaVisitor.scala | 6 +- .../internals/IntendedShortCircuit.scala | 15 --- .../ServerHttpComplianceTestCase.scala | 8 +- .../compliancetests/internals/asserts.scala | 6 +- .../internals/eq/EqSchemaVisitor.scala | 8 +- .../internals/eq/Smithy4sEqInstances.scala | 2 +- .../compliancetests/internals/package.scala | 2 +- .../zio/compliancetests/package.scala | 8 +- .../zio/http/SimpleProtocolBuilder.scala | 2 +- .../http/builders/server/RouterBuilder.scala | 2 +- .../http/internal/SimpleRestJsonCodecs.scala | 2 +- .../smithy4s/zio/http/internal/package.scala | 2 +- .../scala/smithy4s/zio/http/package.scala | 2 +- project/BuildPlugin.scala | 14 +-- project/plugins.sbt | 12 +- publish.sbt | 10 +- 22 files changed, 154 insertions(+), 88 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f0a83e..44a64e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,23 +9,29 @@ name: Continuous Integration on: pull_request: - branches: ['**'] + branches: ['**', '!update/**', '!pr/**'] push: - branches: ['**'] - tags: [v*] + branches: ['**', '!update/**', '!pr/**'] + tags: [v*, v*] env: 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.12] + scala: [2.13] java: [temurin@11] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -33,26 +39,49 @@ jobs: fetch-depth: 0 - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 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: Check that workflows are up to date - run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck + run: sbt githubWorkflowCheck - - name: Build project + - name: Check headers and formatting + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' + run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck + + - name: Test run: sbt '++ ${{ matrix.scala }}' test + - name: Check binary compatibility + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' + run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues + + - name: Generate API documentation + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' + run: sbt '++ ${{ matrix.scala }}' doc + + - name: Make target directories + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + run: mkdir -p modules/examples/target target modules/test-scenarios/target modules/transformers/target modules/schema/target modules/compliance-tests/target modules/prelude/target modules/http/target project/target + - name: Compress target directories + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') run: tar cf targets.tar modules/examples/target target modules/test-scenarios/target modules/transformers/target modules/schema/target modules/compliance-tests/target modules/prelude/target modules/http/target project/target - name: Upload target directories - uses: actions/upload-artifact@v4 + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + uses: actions/upload-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} + name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }} path: targets.tar publish: @@ -62,7 +91,6 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.12] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -72,23 +100,45 @@ jobs: fetch-depth: 0 - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 11 cache: sbt - - name: Download target directories (2.13.12) - uses: actions/download-artifact@v4 + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update + + - name: Download target directories (2.13) + uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13 - - name: Inflate target directories (2.13.12) + - name: Inflate target directories (2.13) run: | tar xf targets.tar rm targets.tar + - name: Import signing key + if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' + 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 -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 project env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} @@ -96,3 +146,35 @@ jobs: SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} run: sbt ci-release + + dependency-submission: + name: Submit Dependencies + if: github.event_name != 'pull_request' + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@11] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v3 + 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: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + configs-ignore: test scala-tool scala-doc-tool test-internal diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index bfc865d..547aaa4 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -17,7 +17,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Delete artifacts - shell: bash {0} run: | # Customize those three lines with your repository and credentials: REPO=${GITHUB_API_URL}/repos/${{ github.repository }} @@ -26,7 +25,7 @@ jobs: ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; } # A temporary file which receives HTTP response headers. - TMPFILE=$(mktemp) + TMPFILE=/tmp/tmp.$$ # An associative array, key: artifact name, value: number of artifacts of that name. declare -A ARTCOUNT diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/HttpProtocolCompliance.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/HttpProtocolCompliance.scala index 72e2c2a..5731573 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/HttpProtocolCompliance.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/HttpProtocolCompliance.scala @@ -33,7 +33,7 @@ object HttpProtocolCompliance { ).allServerTests() def clientAndServerTests[Alg[_[_, _, _, _, _]]]( - router: Router & ReverseRouter, + router: Router with ReverseRouter, service: Service[Alg] ): List[ComplianceTest[Task]] = clientTests(router, service) ++ serverTests(router, service) diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/ProtocolComplianceSuite.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/ProtocolComplianceSuite.scala index 6f65a2f..340f64a 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/ProtocolComplianceSuite.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/ProtocolComplianceSuite.scala @@ -1,11 +1,11 @@ package smithy4s.zio.compliancetests -import smithy4s.codecs.* +import smithy4s.codecs._ import smithy4s.dynamic.DynamicSchemaIndex import smithy4s.dynamic.DynamicSchemaIndex.load import smithy4s.dynamic.model.Model import smithy4s.{Blob, Document, Schema, ShapeId} -import zio.test.* +import zio.test._ import zio.{Scope, Task, ZIO} import java.nio.file.{Path, Paths} @@ -16,7 +16,7 @@ abstract class ProtocolComplianceSuite extends ZIOSpecDefault { def allTests(dsi: DynamicSchemaIndex): List[ComplianceTest[Task]] - override def spec: Spec[TestEnvironment & Scope, Any] = { + override def spec: Spec[TestEnvironment with Scope, Any] = { suite("Protocol Compliance Tests") { makeTests() } diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/CanonicalSmithyDecoder.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/CanonicalSmithyDecoder.scala index bbdd7a5..7c9ae11 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/CanonicalSmithyDecoder.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/CanonicalSmithyDecoder.scala @@ -1,11 +1,11 @@ package smithy4s.zio.compliancetests.internals -import smithy4s.Document.* +import smithy4s.Document._ import smithy4s.codecs.PayloadError -import smithy4s.internals.* -import smithy4s.schema.* -import smithy4s.schema.Primitive.* -import smithy4s.{Schema, *} +import smithy4s.internals._ +import smithy4s.schema._ +import smithy4s.schema.Primitive._ +import smithy4s.{Schema, _} object CanonicalSmithyDecoder { diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/ClientHttpComplianceTestCase.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/ClientHttpComplianceTestCase.scala index 70f3269..5d18d9a 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/ClientHttpComplianceTestCase.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/ClientHttpComplianceTestCase.scala @@ -2,10 +2,10 @@ package smithy4s.zio.compliancetests.internals import cats.Eq import cats.effect.Async -import cats.syntax.all.* -import smithy.test.* +import cats.syntax.all._ +import smithy.test._ import smithy4s.http.HttpContractError -import smithy4s.zio.compliancetests.TestConfig.* +import smithy4s.zio.compliancetests.TestConfig._ import smithy4s.zio.compliancetests.internals.eq.EqSchemaVisitor import smithy4s.zio.compliancetests.{ ComplianceTest, @@ -24,7 +24,7 @@ private[compliancetests] class ClientHttpComplianceTestCase[ ](reverseRouter: ReverseRouter, serviceInstance: Service[Alg])(implicit ce: Async[Task] ) { - import reverseRouter.* + import reverseRouter._ private val baseUri = URL.decode("http://localhost/").toOption.get private[compliancetests] implicit val service: Service[Alg] = serviceInstance diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/DefaultSchemaVisitor.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/DefaultSchemaVisitor.scala index 64b85c3..35d1a20 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/DefaultSchemaVisitor.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/DefaultSchemaVisitor.scala @@ -1,9 +1,9 @@ package smithy4s.zio.compliancetests.internals import smithy4s.Document.DNull -import smithy4s.schema.* -import smithy4s.schema.Primitive.* -import smithy4s.{Schema, *} +import smithy4s.schema._ +import smithy4s.schema.Primitive._ +import smithy4s.{Schema, _} import cats.Id import java.util.UUID diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/IntendedShortCircuit.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/IntendedShortCircuit.scala index 0010985..b1def75 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/IntendedShortCircuit.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/IntendedShortCircuit.scala @@ -1,18 +1,3 @@ -/* - * Copyright 2021-2023 Disney Streaming - * - * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://disneystreaming.github.io/TOST-1.0.txt - * - * 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 smithy4s.zio.compliancetests.internals private[compliancetests] case class IntendedShortCircuit() diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/ServerHttpComplianceTestCase.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/ServerHttpComplianceTestCase.scala index 8a04077..77f3aff 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/ServerHttpComplianceTestCase.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/ServerHttpComplianceTestCase.scala @@ -2,11 +2,11 @@ package smithy4s.zio.compliancetests.internals import cats.Eq import cats.implicits.catsSyntaxSemigroup -import smithy.test.* +import smithy.test._ import smithy4s.codecs.PayloadError -import smithy4s.kinds.* +import smithy4s.kinds._ import smithy4s.zio.compliancetests.ComplianceTest.ComplianceResult -import smithy4s.zio.compliancetests.TestConfig.* +import smithy4s.zio.compliancetests.TestConfig._ import smithy4s.zio.compliancetests.internals.asserts.testResultMonoid import smithy4s.zio.compliancetests.internals.eq.EqSchemaVisitor import smithy4s.zio.compliancetests.{ @@ -27,7 +27,7 @@ private[compliancetests] class ServerHttpComplianceTestCase[ serviceInstance: Service[Alg] ) { - import router.* + import router._ private[compliancetests] val originalService: Service[Alg] = serviceInstance private val baseUri = URL.decode("http://localhost/").toOption.get diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/asserts.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/asserts.scala index 8e988da..8f86cf4 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/asserts.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/asserts.scala @@ -2,11 +2,11 @@ package smithy4s.zio.compliancetests.internals import cats.Eq import cats.kernel.Monoid -import cats.syntax.all.* +import cats.syntax.all._ import io.circe.Json -import io.circe.parser.* +import io.circe.parser._ import smithy.test.{HttpRequestTestCase, HttpResponseTestCase} -import smithy4s.zio.compliancetests.ComplianceTest.* +import smithy4s.zio.compliancetests.ComplianceTest._ import zio.http.{Headers, QueryParams} import zio.test.{TestResult, assertTrue} diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/eq/EqSchemaVisitor.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/eq/EqSchemaVisitor.scala index efbd72a..5a845c6 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/eq/EqSchemaVisitor.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/eq/EqSchemaVisitor.scala @@ -1,11 +1,11 @@ package smithy4s.zio.compliancetests.internals.eq import cats.implicits.toFoldableOps -import smithy4s.* +import smithy4s._ import smithy4s.capability.EncoderK -import cats.syntax.all.* -import smithy4s.schema.{Schema, *} -import smithy4s.zio.compliancetests.internals.eq.Smithy4sEqInstances.* +import cats.syntax.all._ +import smithy4s.schema.{Schema, _} +import smithy4s.zio.compliancetests.internals.eq.Smithy4sEqInstances._ import cats.{Eq, Monoid} import java.util.UUID diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/eq/Smithy4sEqInstances.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/eq/Smithy4sEqInstances.scala index 0edee01..9a13870 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/eq/Smithy4sEqInstances.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/eq/Smithy4sEqInstances.scala @@ -3,7 +3,7 @@ package smithy4s.zio.compliancetests.internals.eq import smithy4s.{Blob, Document, Timestamp} import cats.Eq import cats.kernel.instances.StaticMethods -import cats.syntax.all.* +import cats.syntax.all._ trait Smithy4sEqInstances { implicit def arrayEq[A: Eq]: Eq[Array[A]] = (x: Array[A], y: Array[A]) => x.zip(y).forall { case (a, b) => a === b } diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/package.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/package.scala index 72822d8..c1e39e9 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/package.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/internals/package.scala @@ -5,7 +5,7 @@ import smithy4s.{Hints, Service, ShapeId} import smithy4s.schema.Schema import smithy4s.zio.compliancetests.ComplianceTest.ComplianceResult import zio.ZIO -import zio.http.{Header, Headers, Request, Response} +import zio.http.{Headers, Request, Response} import java.net.URLDecoder import java.nio.charset.StandardCharsets diff --git a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/package.scala b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/package.scala index cf682ca..8a90a43 100644 --- a/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/package.scala +++ b/modules/compliance-tests/src/main/scala/smithy4s/zio/compliancetests/package.scala @@ -3,9 +3,9 @@ package smithy4s.zio import cats.{Eq, Monoid} import smithy.test.HttpRequestTestCase import smithy4s.zio.compliancetests.ComplianceTest.ComplianceResult -import smithy4s.zio.compliancetests.internals.asserts.* +import smithy4s.zio.compliancetests.internals.asserts._ import smithy4s.zio.compliancetests.internals.{asserts, parseQueryParams} -import cats.syntax.all.* +import cats.syntax.all._ import smithy4s.zio.compliancetests.internals.asserts.testCase.{ checkHeaders, checkQueryParameters @@ -24,7 +24,7 @@ import zio.http.{ } import java.util.concurrent.TimeoutException -import zio.interop.catz.core.* +import zio.interop.catz.core._ package object compliancetests { @@ -70,7 +70,7 @@ package object compliancetests { QueryParams(parseQueryParams(testCase.queryParams).toList.map { case (k, v) => (k, Chunk.fromIterable(v)) - } *) + }: _*) ) expectedUri } diff --git a/modules/http/src/main/scala/smithy4s/zio/http/SimpleProtocolBuilder.scala b/modules/http/src/main/scala/smithy4s/zio/http/SimpleProtocolBuilder.scala index 9a272ce..fac4d0b 100644 --- a/modules/http/src/main/scala/smithy4s/zio/http/SimpleProtocolBuilder.scala +++ b/modules/http/src/main/scala/smithy4s/zio/http/SimpleProtocolBuilder.scala @@ -5,7 +5,7 @@ import smithy4s.zio.http.builders.client.ClientBuilder import smithy4s.zio.http.builders.server.RouterBuilder import smithy4s.{Endpoint, ShapeTag} import zio.Task -import zio.http.* +import zio.http._ /** * Abstract construct helping the construction of routers and clients diff --git a/modules/http/src/main/scala/smithy4s/zio/http/builders/server/RouterBuilder.scala b/modules/http/src/main/scala/smithy4s/zio/http/builders/server/RouterBuilder.scala index cdc1fa8..aeb68b6 100644 --- a/modules/http/src/main/scala/smithy4s/zio/http/builders/server/RouterBuilder.scala +++ b/modules/http/src/main/scala/smithy4s/zio/http/builders/server/RouterBuilder.scala @@ -21,7 +21,7 @@ import smithy4s.{ UnsupportedProtocolError, checkProtocol } -import zio.http.* +import zio.http._ import zio.{IO, Task, ZIO} class RouterBuilder[ diff --git a/modules/http/src/main/scala/smithy4s/zio/http/internal/SimpleRestJsonCodecs.scala b/modules/http/src/main/scala/smithy4s/zio/http/internal/SimpleRestJsonCodecs.scala index 8687135..f38570e 100644 --- a/modules/http/src/main/scala/smithy4s/zio/http/internal/SimpleRestJsonCodecs.scala +++ b/modules/http/src/main/scala/smithy4s/zio/http/internal/SimpleRestJsonCodecs.scala @@ -3,7 +3,7 @@ package smithy4s.zio.http.internal import smithy4s.Blob import smithy4s.client.UnaryClientCodecs import smithy4s.codecs.BlobEncoder -import smithy4s.http.* +import smithy4s.http._ import smithy4s.json.Json import smithy4s.zio.http.SimpleProtocolCodecs import smithy4s.zio.http.internal.ZHttpToSmithy4sClient.ResourcefulTask diff --git a/modules/http/src/main/scala/smithy4s/zio/http/internal/package.scala b/modules/http/src/main/scala/smithy4s/zio/http/internal/package.scala index 0c44d45..4cafe8e 100644 --- a/modules/http/src/main/scala/smithy4s/zio/http/internal/package.scala +++ b/modules/http/src/main/scala/smithy4s/zio/http/internal/package.scala @@ -11,7 +11,7 @@ import smithy4s.http.{ HttpUri => Smithy4sHttpUri, HttpUriScheme => Smithy4sHttpUriScheme } -import zio.http.* +import zio.http._ import zio.stream.ZStream import zio.{Chunk, IO, Task, ZIO} diff --git a/modules/http/src/main/scala/smithy4s/zio/http/package.scala b/modules/http/src/main/scala/smithy4s/zio/http/package.scala index 4399506..1e097bf 100644 --- a/modules/http/src/main/scala/smithy4s/zio/http/package.scala +++ b/modules/http/src/main/scala/smithy4s/zio/http/package.scala @@ -5,7 +5,7 @@ import org.typelevel.vault.Key import smithy4s.Endpoint import smithy4s.http.PathParams import zio.Task -import zio.http.* +import zio.http._ package object http { type HttpRoutes = Routes[Any, Throwable] diff --git a/project/BuildPlugin.scala b/project/BuildPlugin.scala index 717ae39..b2c9b46 100644 --- a/project/BuildPlugin.scala +++ b/project/BuildPlugin.scala @@ -64,13 +64,13 @@ object BuildPlugin extends AutoPlugin { "-Ywarn-dead-code", // Warn when dead code is identified. "-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined. "-Ywarn-numeric-widen", // Warn when numerics are widened. - "-Ywarn-unused:implicits", // Warn if an implicit parameter is unused. - // "-Ywarn-unused:imports", // Warn if an import selector is not referenced. - // "-Ywarn-unused:locals", // Warn if a local definition is unused. - // "-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused. - // "-Ywarn-unused:privates", // Warn if a private member is unused. - // "-Ywarn-value-discard", // Warn when non-Unit expression results are unused. - //"-Xfatal-warnings" // Fail the compilation if there are any warnings. + "-Ywarn-unused:implicits" // Warn if an implicit parameter is unused. + // "-Ywarn-unused:imports", // Warn if an import selector is not referenced. + // "-Ywarn-unused:locals", // Warn if a local definition is unused. + // "-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused. + // "-Ywarn-unused:privates", // Warn if a private member is unused. + // "-Ywarn-value-discard", // Warn when non-Unit expression results are unused. + // "-Xfatal-warnings" // Fail the compilation if there are any warnings. ) } diff --git a/project/plugins.sbt b/project/plugins.sbt index 07df7ed..2aee88c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,11 +9,11 @@ addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") addSbtPlugin("com.disneystreaming.smithy4s" % "smithy4s-sbt-codegen" % "0.18.5") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") -addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.22.0") -addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0") -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.1") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.2") + +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.1") // sbt revolver addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1") diff --git a/publish.sbt b/publish.sbt index e293da3..9f3f0f0 100644 --- a/publish.sbt +++ b/publish.sbt @@ -7,20 +7,20 @@ ThisBuild / scmInfo := Some( "scm:git@github.com:yisraelu/smithy4s-zio.git" ) ) -ThisBuild / githubWorkflowJavaVersions := List(JavaSpec.temurin("11")) +ThisBuild / githubWorkflowJavaVersions := List(JavaSpec.temurin("11")) ThisBuild / githubWorkflowTargetTags ++= Seq("v*") -ThisBuild / githubWorkflowPublishTargetBranches := Seq( +ThisBuild / githubWorkflowPublishTargetBranches := Seq( RefPredicate.StartsWith(Ref.Tag("v")), RefPredicate.Equals(Ref.Branch("main")) ) -ThisBuild / githubWorkflowPublish := Seq( +ThisBuild / githubWorkflowPublish := Seq( WorkflowStep.Sbt( commands = List("ci-release"), name = Some("Publish project"), env = Map( - "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}", - "PGP_SECRET" -> "${{ secrets.PGP_SECRET }}", + "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}", + "PGP_SECRET" -> "${{ secrets.PGP_SECRET }}", "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PASSWORD }}", "SONATYPE_USERNAME" -> "${{ secrets.SONATYPE_USERNAME }}" )