From 9e10af37ce4440edec2ff1e7648acfaeb79a5eab Mon Sep 17 00:00:00 2001 From: Noel Welsh Date: Wed, 10 Apr 2024 17:20:31 +0100 Subject: [PATCH] Formatting --- .../doodle/algebra/generic/Finalized.scala | 2 +- .../doodle/algebra/generic/package.scala | 6 +++--- .../doodle/algebra/generic/Generators.scala | 2 +- .../test/scala/doodle/core/ColorSuite.scala | 2 +- docs/src/pages/algebra/basic-with-text.png | Bin 2747 -> 2866 bytes .../doodle/examples/ConcentricCircles.scala | 3 ++- .../scala/doodle/examples/DoodleLogo.scala | 3 ++- .../doodle/examples/ParametricSpiral.scala | 3 ++- .../scala/doodle/examples/PulsingCircle.scala | 5 +++-- .../doodle/examples/TextPositioning.scala | 3 ++- .../doodle/java2d/effect/Java2DPanel.scala | 2 +- .../scala/doodle/java2d/effect/Java2d.scala | 2 +- .../effect/Java2dBufferedImageWriter.scala | 2 +- .../doodle/java2d/effect/Java2dWriter.scala | 2 +- .../doodle/java2d/Base64WriterSuite.scala | 4 ++-- .../scala/doodle/java2d/ToPictureSuite.scala | 6 +++--- 16 files changed, 26 insertions(+), 21 deletions(-) diff --git a/core/shared/src/main/scala/doodle/algebra/generic/Finalized.scala b/core/shared/src/main/scala/doodle/algebra/generic/Finalized.scala index b001a330..75618ebc 100644 --- a/core/shared/src/main/scala/doodle/algebra/generic/Finalized.scala +++ b/core/shared/src/main/scala/doodle/algebra/generic/Finalized.scala @@ -20,7 +20,7 @@ package generic import cats.Eval import cats.Later -import cats.data.* +import cats.data._ import doodle.core.BoundingBox import doodle.core.{Transform => Tx} diff --git a/core/shared/src/main/scala/doodle/algebra/generic/package.scala b/core/shared/src/main/scala/doodle/algebra/generic/package.scala index d81d6b18..cd61bec5 100644 --- a/core/shared/src/main/scala/doodle/algebra/generic/package.scala +++ b/core/shared/src/main/scala/doodle/algebra/generic/package.scala @@ -17,9 +17,9 @@ package doodle package algebra -import cats.* -import cats.data.* -import cats.syntax.all.* +import cats._ +import cats.data._ +import cats.syntax.all._ import doodle.core.{Transform => Tx} package object generic { diff --git a/core/shared/src/test/scala/doodle/algebra/generic/Generators.scala b/core/shared/src/test/scala/doodle/algebra/generic/Generators.scala index cbfb9c47..f4e907f2 100644 --- a/core/shared/src/test/scala/doodle/algebra/generic/Generators.scala +++ b/core/shared/src/test/scala/doodle/algebra/generic/Generators.scala @@ -19,7 +19,7 @@ package algebra package generic import cats.instances.unit._ -import doodle.algebra.generic.* +import doodle.algebra.generic._ import doodle.algebra.generic.reified.Reification import doodle.algebra.generic.reified.Reified import doodle.core.{Transform => Tx} diff --git a/core/shared/src/test/scala/doodle/core/ColorSuite.scala b/core/shared/src/test/scala/doodle/core/ColorSuite.scala index 931f8fd1..68672efe 100644 --- a/core/shared/src/test/scala/doodle/core/ColorSuite.scala +++ b/core/shared/src/test/scala/doodle/core/ColorSuite.scala @@ -17,7 +17,7 @@ package doodle package core -import doodle.syntax.all.* +import doodle.syntax.all._ import munit.FunSuite class ColorSuite extends FunSuite { diff --git a/docs/src/pages/algebra/basic-with-text.png b/docs/src/pages/algebra/basic-with-text.png index a86ec174f33d965e20e577031e970759969d0e99..4968ed7291ff13324bfa8c18dad9635590a92c6e 100644 GIT binary patch literal 2866 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 L#0FMr Java2dEffect} import java.awt.image.BufferedImage diff --git a/java2d/src/main/scala/doodle/java2d/effect/Java2dWriter.scala b/java2d/src/main/scala/doodle/java2d/effect/Java2dWriter.scala index 0e8716a5..4303f439 100644 --- a/java2d/src/main/scala/doodle/java2d/effect/Java2dWriter.scala +++ b/java2d/src/main/scala/doodle/java2d/effect/Java2dWriter.scala @@ -25,7 +25,7 @@ import de.erichseifert.vectorgraphics2d.util.PageSize import doodle.core.BoundingBox import doodle.core.format._ import doodle.core.{Base64 => B64} -import doodle.effect.* +import doodle.effect._ import doodle.java2d.effect.{Java2d => Java2dEffect} import java.awt.image.BufferedImage diff --git a/java2d/src/test/scala/doodle/java2d/Base64WriterSuite.scala b/java2d/src/test/scala/doodle/java2d/Base64WriterSuite.scala index 8431046b..fc8569be 100644 --- a/java2d/src/test/scala/doodle/java2d/Base64WriterSuite.scala +++ b/java2d/src/test/scala/doodle/java2d/Base64WriterSuite.scala @@ -19,8 +19,8 @@ package java2d import cats.effect.unsafe.implicits.global import doodle.core.Base64 -import doodle.core.format.* -import doodle.syntax.all.* +import doodle.core.format._ +import doodle.syntax.all._ import munit.FunSuite class Base64WriterSuite extends FunSuite { diff --git a/java2d/src/test/scala/doodle/java2d/ToPictureSuite.scala b/java2d/src/test/scala/doodle/java2d/ToPictureSuite.scala index 5bbaa53e..a23d4ff6 100644 --- a/java2d/src/test/scala/doodle/java2d/ToPictureSuite.scala +++ b/java2d/src/test/scala/doodle/java2d/ToPictureSuite.scala @@ -19,10 +19,10 @@ package java2d import cats.effect.unsafe.implicits.global import doodle.algebra.ToPicture -import doodle.core.format.* +import doodle.core.format._ import doodle.core.{Base64 => B64} -import doodle.effect.* -import doodle.syntax.all.* +import doodle.effect._ +import doodle.syntax.all._ import munit.FunSuite class ToPictureSuite extends FunSuite {