From 151e93e943a42ba3431036a91b66699468c5fffc Mon Sep 17 00:00:00 2001 From: danicheg Date: Wed, 29 Sep 2021 19:51:49 +0300 Subject: [PATCH 1/5] Bump sbt-http4s-org --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a237a1d08..d2b4bc4af 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.0") addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1") -addSbtPlugin("org.http4s" %% "sbt-http4s-org" % "0.8.2") +addSbtPlugin("org.http4s" %% "sbt-http4s-org" % "0.8.3") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") From b88ee18ed31b069ea610f800e06d7d2af7224d60 Mon Sep 17 00:00:00 2001 From: danicheg Date: Wed, 29 Sep 2021 19:53:05 +0300 Subject: [PATCH 2/5] Regenerate ci.yml --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 312ba57bc..2047b3b59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,11 @@ on: tags: [v*, v*] env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json' + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} PGP_SECRET: ${{ secrets.PGP_SECRET }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: build: From cc4ee811b6f5f6d69c2cb06664acdba2de2c30a9 Mon Sep 17 00:00:00 2001 From: danicheg Date: Wed, 29 Sep 2021 19:55:10 +0300 Subject: [PATCH 3/5] Use adoptium@1.8 in CI --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 58f1254fe..fda2d14aa 100644 --- a/build.sbt +++ b/build.sbt @@ -70,7 +70,7 @@ lazy val commonSettings = Seq( ) ) -ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8") +ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@1.8") ThisBuild / githubWorkflowTargetTags ++= Seq("v*") From d15bfcfbff77dd9b38b3b20610989068efae0f28 Mon Sep 17 00:00:00 2001 From: danicheg Date: Wed, 29 Sep 2021 19:55:40 +0300 Subject: [PATCH 4/5] Regenerate ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2047b3b59..42e376a72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.15, 2.13.6, 3.0.2] - java: [adopt@1.8] + java: [adoptium@1.8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -67,7 +67,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adopt@1.8] + java: [adoptium@1.8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) From 179f2caae81a81d543338a0d22b1e21f50717c15 Mon Sep 17 00:00:00 2001 From: danicheg Date: Wed, 29 Sep 2021 19:58:59 +0300 Subject: [PATCH 5/5] Fix typo in jdk version --- .github/workflows/ci.yml | 4 ++-- build.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42e376a72..d38f93abd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.15, 2.13.6, 3.0.2] - java: [adoptium@1.8] + java: [adoptium@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -67,7 +67,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.6] - java: [adoptium@1.8] + java: [adoptium@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) diff --git a/build.sbt b/build.sbt index fda2d14aa..6600e82ee 100644 --- a/build.sbt +++ b/build.sbt @@ -70,7 +70,7 @@ lazy val commonSettings = Seq( ) ) -ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@1.8") +ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8") ThisBuild / githubWorkflowTargetTags ++= Seq("v*")