From d03582765689bbbc90f032cd5790922ab3e56dc9 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Mon, 5 Jun 2023 07:26:53 +0200 Subject: [PATCH 01/18] Patch updates --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e50494ed..58904246 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ ThisBuild / libraryDependencySchemes ++= Seq( ) addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") From 170462a3c9fda28335cec162f2e588aac1660157 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Wed, 14 Jun 2023 07:22:22 +0200 Subject: [PATCH 02/18] Patch updates --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index ab9d4cc9..64a5cb13 100644 --- a/build.sbt +++ b/build.sbt @@ -2,8 +2,8 @@ import ProjectPlugin.on ThisBuild / organization := "com.47deg" -val scala212 = "2.12.17" -val scala213 = "2.13.10" +val scala212 = "2.12.18" +val scala213 = "2.13.11" val scala3Version = "3.2.2" val scala2Versions = Seq(scala212, scala213) val allScalaVersions = scala2Versions :+ scala3Version From 971053942029c9832cf191c386d0e082f18a7cb1 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 23 Jun 2023 07:23:50 +0200 Subject: [PATCH 03/18] Dependency updates --- project/ProjectPlugin.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 7a88f073..59b0e4a3 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -23,7 +23,7 @@ object ProjectPlugin extends AutoPlugin { val paradise: String = "2.1.1" val scalacheck = "1.17.0" val scalacheckShapeless = "1.3.0" - val scalacheckPlusScalatest = "3.2.11.0" + val scalacheckPlusScalatest = "3.2.14.0" val scalatest: String = "3.2.16" val shapeless3 = "3.3.0" } @@ -85,7 +85,7 @@ object ProjectPlugin extends AutoPlugin { "org.http4s" %% "http4s-dsl" % V.http4s % Test, "org.http4s" %% "http4s-server" % V.http4s % Test, "org.scalacheck" %% "scalacheck" % V.scalacheck % Test, - "org.scalatestplus" %% "scalacheck-1-15" % V.scalacheckPlusScalatest % Test + "org.scalatestplus" %% "scalacheck-1-16" % V.scalacheckPlusScalatest % Test ), libraryDependencies ++= on(2, 12)( compilerPlugin("org.scalamacros" %% "paradise" % V.paradise cross CrossVersion.full) From fe5a1cb8a26fe7dc5f20f043e2fdcafd3b38629c Mon Sep 17 00:00:00 2001 From: 47erbot Date: Wed, 30 Aug 2023 07:27:07 +0200 Subject: [PATCH 04/18] Patch updates --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 58904246..c6cbbfe0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ ThisBuild / libraryDependencySchemes ++= Seq( addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.1") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") From e8d1b0cbefcc853eb2a540d404223978534b7fa2 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 1 Sep 2023 07:28:59 +0200 Subject: [PATCH 05/18] Patch updates --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c6cbbfe0..a9833e29 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ ThisBuild / libraryDependencySchemes ++= Seq( addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") From a566b2b28247327146bf1c82626d671f47ad8cb4 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 8 Sep 2023 07:26:33 +0200 Subject: [PATCH 06/18] Patch updates --- project/ProjectPlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 59b0e4a3..9de94567 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -24,7 +24,7 @@ object ProjectPlugin extends AutoPlugin { val scalacheck = "1.17.0" val scalacheckShapeless = "1.3.0" val scalacheckPlusScalatest = "3.2.14.0" - val scalatest: String = "3.2.16" + val scalatest: String = "3.2.17" val shapeless3 = "3.3.0" } From 39aa858811e0365f448a2cbaf2a8e789bbae3664 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 15 Sep 2023 07:22:30 +0200 Subject: [PATCH 07/18] Patch updates --- build.sbt | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 64a5cb13..4a298740 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import ProjectPlugin.on ThisBuild / organization := "com.47deg" val scala212 = "2.12.18" -val scala213 = "2.13.11" +val scala213 = "2.13.12" val scala3Version = "3.2.2" val scala2Versions = Seq(scala212, scala213) val allScalaVersions = scala2Versions :+ scala3Version diff --git a/project/plugins.sbt b/project/plugins.sbt index a9833e29..22292740 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ ThisBuild / libraryDependencySchemes ++= Seq( ) addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") From f8885623bb70ededd6d51e8f8f1b294e4b3376aa Mon Sep 17 00:00:00 2001 From: 47erbot Date: Wed, 11 Oct 2023 07:22:44 +0200 Subject: [PATCH 08/18] Patch updates --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 22292740..99f21ec7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12" addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") addSbtPlugin("com.alejandrohdezma" % "sbt-codecov" % "0.2.1") From 2a4766971637e35e43b88e812d791d20accedf3e Mon Sep 17 00:00:00 2001 From: 47erbot Date: Tue, 31 Oct 2023 10:52:58 +0100 Subject: [PATCH 09/18] Minor/major updates --- build.sbt | 4 +++- project/ProjectPlugin.scala | 2 +- project/plugins.sbt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 4a298740..b9222e61 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,9 @@ lazy val github4s = (crossProject(JSPlatform, JVMPlatform)) // See the README for why this is necessary // https://github.com/scala-js/scala-js-macrotask-executor/tree/v1.0.0 // tl;dr: without it, performance problems and concurrency bugs abound - libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0" % Test + libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0" % Test, + // Disable nonunit warning on tests + Test / scalacOptions -= "-Wnonunit-statement" ) ////////// diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 9de94567..239625bd 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -18,7 +18,7 @@ object ProjectPlugin extends AutoPlugin { val cats: String = "2.9.0" val circe: String = "0.14.3" val expecty = "0.16.0" - val http4s: String = "0.23.16" + val http4s: String = "0.23.17" val http4sBlazeClient: String = "0.23.13" val paradise: String = "2.1.1" val scalacheck = "1.17.0" diff --git a/project/plugins.sbt b/project/plugins.sbt index 99f21ec7..a708bb1b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -13,6 +13,6 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.11.6" addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.6") addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.6") addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") From cf6642c4d7da5e8c64c6fa6378689ec084f2f5a0 Mon Sep 17 00:00:00 2001 From: fedefernandez Date: Tue, 31 Oct 2023 10:50:16 +0000 Subject: [PATCH 10/18] Update documentation, and other files [skip ci] --- AUTHORS.md | 5 ++--- README.md | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 4013edfb..20be3def 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -19,15 +19,14 @@ These are the people that have contributed to the _github4s_ project: - [![47erbot](https://avatars.githubusercontent.com/u/24799081?v=4&s=20) **47erbot**](https://github.com/47erbot) - [![BenFradet](https://avatars.githubusercontent.com/u/1737211?v=4&s=20) **BenFradet**](https://github.com/BenFradet) - [![juanpedromoreno](https://avatars.githubusercontent.com/u/4879373?v=4&s=20) **juanpedromoreno**](https://github.com/juanpedromoreno) -- [![rafaparadela](https://avatars.githubusercontent.com/u/315070?v=4&s=20) **rafaparadela**](https://github.com/rafaparadela) - [![47degdev](https://avatars.githubusercontent.com/u/5580770?v=4&s=20) **47degdev**](https://github.com/47degdev) -- [![fedefernandez](https://avatars.githubusercontent.com/u/720923?v=4&s=20) **fedefernandez**](https://github.com/fedefernandez) - [![sloshy](https://avatars.githubusercontent.com/u/427237?v=4&s=20) **sloshy**](https://github.com/sloshy) - [![jdesiloniz](https://avatars.githubusercontent.com/u/2835739?v=4&s=20) **jdesiloniz**](https://github.com/jdesiloniz) - [![reimai](https://avatars.githubusercontent.com/u/1123908?v=4&s=20) **reimai**](https://github.com/reimai) - [![anamariamv](https://avatars.githubusercontent.com/u/2183589?v=4&s=20) **anamariamv**](https://github.com/anamariamv) - [![nicoulaj](https://avatars.githubusercontent.com/u/3162?v=4&s=20) **nicoulaj**](https://github.com/nicoulaj) - [![calvellido](https://avatars.githubusercontent.com/u/7753447?v=4&s=20) **calvellido**](https://github.com/calvellido) +- [![fedefernandez](https://avatars.githubusercontent.com/u/720923?v=4&s=20) **fedefernandez**](https://github.com/fedefernandez) - [![AdrianRaFo](https://avatars.githubusercontent.com/u/15971742?v=4&s=20) **AdrianRaFo**](https://github.com/AdrianRaFo) - [![Daenyth](https://avatars.githubusercontent.com/u/14644?v=4&s=20) **Daenyth**](https://github.com/Daenyth) - [![alejandrohdezma](https://avatars.githubusercontent.com/u/9027541?v=4&s=20) **alejandrohdezma**](https://github.com/alejandrohdezma) @@ -52,7 +51,7 @@ These are the people that have contributed to the _github4s_ project: - [![chalenge](https://avatars.githubusercontent.com/u/5385518?v=4&s=20) **chalenge**](https://github.com/chalenge) - [![dcsobral](https://avatars.githubusercontent.com/u/141079?v=4&s=20) **dcsobral**](https://github.com/dcsobral) - [![drwlrsn](https://avatars.githubusercontent.com/u/981387?v=4&s=20) **drwlrsn**](https://github.com/drwlrsn) -- [![israelpzglez](https://avatars.githubusercontent.com/u/646886?v=4&s=20) **israelpzglez**](https://github.com/israelpzglez) +- [![israelperezglez](https://avatars.githubusercontent.com/u/646886?v=4&s=20) **israelperezglez**](https://github.com/israelperezglez) - [![javimartinez](https://avatars.githubusercontent.com/u/9149487?v=4&s=20) **javimartinez**](https://github.com/javimartinez) - [![guersam](https://avatars.githubusercontent.com/u/969120?v=4&s=20) **guersam**](https://github.com/guersam) - [![josevi96](https://avatars.githubusercontent.com/u/22874841?v=4&s=20) **josevi96**](https://github.com/josevi96) diff --git a/README.md b/README.md index ab865fa1..0044ba0d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Join the chat at https://gitter.im/47degrees/github4s](https://badges.gitter.im/47degrees/github4s.svg)](https://gitter.im/47degrees/github4s?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![codecov.io](http://codecov.io/gh/47degrees/github4s/branch/master/graph/badge.svg)](http://codecov.io/gh/47degrees/github4s) [![Maven Central](https://img.shields.io/badge/maven%20central-0.32.0-green.svg)](https://oss.sonatype.org/#nexus-search;gav~com.47deg~github4s*) [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/47degrees/github4s/master/LICENSE) [![Latest version](https://img.shields.io/badge/github4s-0.32.0-green.svg)](https://index.scala-lang.org/47degrees/github4s) [![GitHub Issues](https://img.shields.io/github/issues/47degrees/github4s.svg)](https://github.com/47degrees/github4s/issues) +[![Join the chat at https://gitter.im/47degrees/github4s](https://badges.gitter.im/47degrees/github4s.svg)](https://gitter.im/47degrees/github4s?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![codecov.io](http://codecov.io/gh/47degrees/github4s/branch/master/graph/badge.svg)](http://codecov.io/gh/47degrees/github4s) [![Maven Central](https://img.shields.io/badge/maven%20central-0.32.1-green.svg)](https://oss.sonatype.org/#nexus-search;gav~com.47deg~github4s*) [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/47degrees/github4s/master/LICENSE) [![Latest version](https://img.shields.io/badge/github4s-0.32.1-green.svg)](https://index.scala-lang.org/47degrees/github4s) [![GitHub Issues](https://img.shields.io/github/issues/47degrees/github4s.svg)](https://github.com/47degrees/github4s/issues) Github4s ============= @@ -11,7 +11,7 @@ Github4s To get started with SBT, simply add the following to your build.sbt file. ```scala -libraryDependencies += "com.47deg" %% "github4s" % "0.32.0" +libraryDependencies += "com.47deg" %% "github4s" % "0.32.1" ``` ## Github4s in the wild From 54b80e6edc52d99fc938b69254ea95173637799d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Wed, 1 Nov 2023 18:00:57 +0100 Subject: [PATCH 11/18] Some libraries upgrades (#884) * Some libraries upgrades * Configure memory opts --- .jvmopts | 16 ++++++---------- build.sbt | 12 +++++++----- project/ProjectPlugin.scala | 8 ++++---- project/build.properties | 2 +- project/plugins.sbt | 2 +- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.jvmopts b/.jvmopts index e064f852..b879f0a1 100644 --- a/.jvmopts +++ b/.jvmopts @@ -1,11 +1,7 @@ -# Cats jvmopts see https://weblogs.java.net/blog/kcpeppe/archive/2013/12/11/case-study-jvm-hotspot-flags --Xms2G --Xmx6G --Xss64m --XX:MaxMetaspaceSize=1024M --XX:ReservedCodeCacheSize=250M +-Dfile.encoding=UTF8 +-Xms1G +-Xmx5G +-Xss128m +-XX:ReservedCodeCacheSize=500M -XX:+TieredCompilation --XX:-UseGCOverheadLimit -# effectively adds GC to Perm space --XX:+CMSClassUnloadingEnabled -# must be enabled for CMSClassUnloadingEnabled to work +-XX:+UseParallelGC diff --git a/build.sbt b/build.sbt index b9222e61..ea02de3f 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / organization := "com.47deg" val scala212 = "2.12.18" val scala213 = "2.13.12" -val scala3Version = "3.2.2" +val scala3Version = "3.3.0" val scala2Versions = Seq(scala212, scala213) val allScalaVersions = scala2Versions :+ scala3Version ThisBuild / scalaVersion := scala213 @@ -20,13 +20,15 @@ lazy val github4s = (crossProject(JSPlatform, JVMPlatform)) .crossType(CrossType.Full) .withoutSuffixFor(JVMPlatform) .settings(coreDeps: _*) + .jsSettings( + // See the README for why this is necessary + // https://github.com/scala-js/scala-js-macrotask-executor/tree/v1.1.1 + // tl;dr: without it, performance problems and concurrency bugs abound + libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.1.1" % Test + ) .settings( // Increase number of inlines, needed for circe semiauto derivation scalacOptions ++= on(3)(Seq("-Xmax-inlines", "48")).value.flatten, - // See the README for why this is necessary - // https://github.com/scala-js/scala-js-macrotask-executor/tree/v1.0.0 - // tl;dr: without it, performance problems and concurrency bugs abound - libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0" % Test, // Disable nonunit warning on tests Test / scalacOptions -= "-Wnonunit-statement" ) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 239625bd..c8c80eaa 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -15,11 +15,11 @@ object ProjectPlugin extends AutoPlugin { lazy val V = new { val bm4 = "0.3.1" - val cats: String = "2.9.0" - val circe: String = "0.14.3" + val cats: String = "2.10.0" + val circe: String = "0.14.6" val expecty = "0.16.0" - val http4s: String = "0.23.17" - val http4sBlazeClient: String = "0.23.13" + val http4s: String = "0.23.23" + val http4sBlazeClient: String = "0.23.15" val paradise: String = "2.1.1" val scalacheck = "1.17.0" val scalacheckShapeless = "1.3.0" diff --git a/project/build.properties b/project/build.properties index ef3d2662..b19d4e1e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.8.3 +sbt.version = 1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index a708bb1b..77c9b049 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -15,4 +15,4 @@ addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.6" addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") From d807ca186f7a7d2cc09422f6f3d40236c92a0493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:22:12 +0100 Subject: [PATCH 12/18] bump plugins (#886) --- .scalafmt.conf | 6 ++++++ .../scala-3/github4s/ArbitraryDerivation.scala | 17 ++++++++++------- project/plugins.sbt | 14 +++++++------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 672e2294..a5024346 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -7,6 +7,12 @@ runner { dialect = scala213 } +fileOverride { + "glob:**/github4s/shared/src/test/scala-3/**" { + runner.dialect = scala3 + } +} + continuationIndent.callSite = 2 newlines { diff --git a/github4s/shared/src/test/scala-3/github4s/ArbitraryDerivation.scala b/github4s/shared/src/test/scala-3/github4s/ArbitraryDerivation.scala index 8621aaf9..81bd2e99 100644 --- a/github4s/shared/src/test/scala-3/github4s/ArbitraryDerivation.scala +++ b/github4s/shared/src/test/scala-3/github4s/ArbitraryDerivation.scala @@ -9,7 +9,6 @@ object ArbitraryDerivation { self => object semiauto: extension (A: Arbitrary.type) inline def derived[A]: Arbitrary[A] = - import auto.given summonInline[Arbitrary[A]] inline def deriveArb[A](using g: K0.Generic[A]): Arbitrary[A] = @@ -26,20 +25,24 @@ object ArbitraryDerivation { self => // https://scastie.scala-lang.org/b8CXWfmXQUClqXplyA6TJg opaque type DerivedGen[A] = Gen[A] object DerivedGen extends DerivedGenInstances: - given [A]: Conversion[Gen[A], DerivedGen[A]] = identity + given [A]: Conversion[Gen[A], DerivedGen[A]] = identity extension [A](gen: DerivedGen[A]) def arb: Arbitrary[A] = Arbitrary(gen) private final class ArrayProduct(elems: Array[Any]) extends Product: - def canEqual(that: Any): Boolean = true - def productElement(n: Int): Any = elems(n) - def productArity: Int = elems.length + def canEqual(that: Any): Boolean = true + def productElement(n: Int): Any = elems(n) + def productArity: Int = elems.length override def productIterator: Iterator[Any] = elems.iterator def product[A](arbs: Seq[Arbitrary[_]])(using gen: K0.ProductGeneric[A]): DerivedGen[A] = - Gen.sequence[Array[Any], Any](arbs.map(_.arbitrary)).map(arr => gen.fromProduct(ArrayProduct(arr)).asInstanceOf[A]) + Gen + .sequence[Array[Any], Any](arbs.map(_.arbitrary)) + .map(arr => gen.fromProduct(ArrayProduct(arr)).asInstanceOf[A]) def coproduct[A](arbs: => IndexedSeq[Arbitrary[_ <: A]]): DerivedGen[A] = - Gen.lzy(if arbs.isEmpty then Gen.fail else Gen.choose(0, arbs.length - 1).flatMap(arbs(_).arbitrary)) + Gen.lzy( + if arbs.isEmpty then Gen.fail else Gen.choose(0, arbs.length - 1).flatMap(arbs(_).arbitrary) + ) sealed abstract class DerivedGenInstances: inline def summonAllArb[A, U](using gen: K0.Generic[A]): IndexedSeq[Arbitrary[_ <: U]] = diff --git a/project/plugins.sbt b/project/plugins.sbt index 77c9b049..16419699 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,14 +5,14 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12" addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.alejandrohdezma" % "sbt-codecov" % "0.2.1") -addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.11.6") -addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.6") -addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.6") +addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.11.11") +addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.11") +addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.11") addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") From 89f03dfc4230ab9c9d4a7a65c0d2f4406029c60e Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 3 Nov 2023 06:25:58 +0100 Subject: [PATCH 13/18] Patch updates --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ea02de3f..6d4da2c9 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / organization := "com.47deg" val scala212 = "2.12.18" val scala213 = "2.13.12" -val scala3Version = "3.3.0" +val scala3Version = "3.3.1" val scala2Versions = Seq(scala212, scala213) val allScalaVersions = scala2Versions :+ scala3Version ThisBuild / scalaVersion := scala213 From 75f72dcb5cc3c676d6dba9d3743281cf06399491 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Mon, 6 Nov 2023 06:21:52 +0100 Subject: [PATCH 14/18] Minor/major updates --- .scalafmt.conf | 2 +- project/plugins.sbt | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a5024346..9e6f0e51 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.7.15 style = defaultWithAlign maxColumn = 100 diff --git a/project/plugins.sbt b/project/plugins.sbt index 16419699..00e7a63d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,18 +1,18 @@ ThisBuild / libraryDependencySchemes ++= Seq( "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always ) -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0") -addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("com.alejandrohdezma" % "sbt-codecov" % "0.2.1") -addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.11.11") -addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.11") -addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.11") -addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0") +addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") +addSbtPlugin("com.alejandrohdezma" % "sbt-codecov" % "0.2.1") +addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.11.11") +addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.11") +addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.11") +addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0") +addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") From 172082f2506d37a16eda093d58082f4ba7f8b44f Mon Sep 17 00:00:00 2001 From: 47erbot Date: Wed, 8 Nov 2023 06:19:41 +0100 Subject: [PATCH 15/18] Minor/major updates --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 00e7a63d..6aa037b4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.0") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.alejandrohdezma" % "sbt-codecov" % "0.2.1") From 977e6dac95450986c2c63b405af721465be782df Mon Sep 17 00:00:00 2001 From: 47erbot Date: Mon, 13 Nov 2023 12:48:39 +0100 Subject: [PATCH 16/18] Patch updates --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 6aa037b4..5b30e905 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,10 +2,10 @@ ThisBuild / libraryDependencySchemes ++= Seq( "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always ) addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.0") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.1") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.alejandrohdezma" % "sbt-codecov" % "0.2.1") From 09b106d8562e18d370ecc08822dd28ce74a39cce Mon Sep 17 00:00:00 2001 From: 47erbot Date: Wed, 15 Nov 2023 06:25:30 +0100 Subject: [PATCH 17/18] Minor/major updates --- project/ProjectPlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index c8c80eaa..44984277 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -18,7 +18,7 @@ object ProjectPlugin extends AutoPlugin { val cats: String = "2.10.0" val circe: String = "0.14.6" val expecty = "0.16.0" - val http4s: String = "0.23.23" + val http4s: String = "0.23.24" val http4sBlazeClient: String = "0.23.15" val paradise: String = "2.1.1" val scalacheck = "1.17.0" From 7589d64799df341160987bf4d39f8b10e29cdf43 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 17 Nov 2023 06:20:51 +0100 Subject: [PATCH 18/18] Patch updates --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9e6f0e51..c0ac0c68 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.15 +version = 3.7.17 style = defaultWithAlign maxColumn = 100