From 9c6a66d4510dc84120be57e25d7a0bf40a33b47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pawlik?= Date: Thu, 4 Mar 2021 08:15:36 +0100 Subject: [PATCH] Bump scala to 2.13.5 (#38) * bump scala to 2.13.5 * drop unused MonadError from authorization code provider --- .github/workflows/ci.yml | 10 +++++----- build.sbt | 2 +- .../sttp/oauth2/AuthorizationCodeProvider.scala | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9deadbbe..16d3d609 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.12, 2.13.4] + scala: [2.12.12, 2.13.5] java: [graalvm-ce-java11@20.3.0] runs-on: ${{ matrix.os }} steps: @@ -74,7 +74,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.4] + scala: [2.13.5] java: [graalvm-ce-java11@20.3.0] runs-on: ${{ matrix.os }} steps: @@ -110,12 +110,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.4) + - name: Download target directories (2.13.5) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.4-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.5-${{ matrix.java }} - - name: Inflate target directories (2.13.4) + - name: Inflate target directories (2.13.5) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index f170a6e8..675bc20c 100644 --- a/build.sbt +++ b/build.sbt @@ -31,7 +31,7 @@ inThisBuild( def crossPlugin(x: sbt.librarymanagement.ModuleID) = compilerPlugin(x.cross(CrossVersion.full)) val Scala212 = "2.12.12" -val Scala213 = "2.13.4" +val Scala213 = "2.13.5" val GraalVM11 = "graalvm-ce-java11@20.3.0" diff --git a/oauth2/src/main/scala/com/ocadotechnology/sttp/oauth2/AuthorizationCodeProvider.scala b/oauth2/src/main/scala/com/ocadotechnology/sttp/oauth2/AuthorizationCodeProvider.scala index b62a4673..7cc63d4e 100644 --- a/oauth2/src/main/scala/com/ocadotechnology/sttp/oauth2/AuthorizationCodeProvider.scala +++ b/oauth2/src/main/scala/com/ocadotechnology/sttp/oauth2/AuthorizationCodeProvider.scala @@ -1,6 +1,5 @@ package com.ocadotechnology.sttp.oauth2 -import cats.MonadError import eu.timepit.refined.api.Refined import eu.timepit.refined.string.Url import eu.timepit.refined.refineV @@ -99,7 +98,7 @@ object AuthorizationCodeProvider { } - def uriInstance[F[_]: MonadError[*[_], Throwable]]( + def uriInstance[F[_]]( baseUrl: Uri, redirectUri: Uri, clientId: String,