diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc3480e..b0f5ea2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,71 +15,54 @@ on: tags: [v*] env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} 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.12.18] + scala: [2.12] java: [temurin@11, temurin@17] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Download Java (temurin@11) - id: download-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 11 - - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + cache: sbt - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - name: Check that workflows are up to date run: sbt githubWorkflowCheck @@ -88,13 +71,13 @@ jobs: 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 scalafix lints if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' 'scalafixAll --check' + - 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 @@ -105,11 +88,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: mkdir -p target site/target core/target project/target + run: mkdir -p core/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 target site/target core/target project/target + run: tar cf targets.tar core/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') @@ -133,84 +116,131 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@11) - id: download-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 11 - - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + cache: sbt - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - - name: Download target directories (2.12.18) + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update + + - name: Download target directories (2.12) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18 + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12 - - name: Inflate target directories (2.12.18) + - name: Inflate target directories (2.12) 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 -di | 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 -di > /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 + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} run: sbt tlCiRelease + 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@v3 + 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: Setup Java (temurin@17) + id: setup-java-temurin-17 + if: matrix.java == 'temurin@17' + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 17 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: sbt-circe-org_2.12 docs_2.12 + configs-ignore: test scala-tool scala-doc-tool test-internal + validate-steward: name: Validate Steward Config strategy: matrix: os: [ubuntu-latest] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (fast) uses: actions/checkout@v3 + - 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 + - uses: coursier/setup-action@v1 with: apps: scala-steward @@ -230,56 +260,38 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@11) - id: download-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 11 - - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + cache: sbt - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - name: Generate site run: sbt docs/tlSite - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' - uses: peaceiris/actions-gh-pages@v3.9.0 + uses: peaceiris/actions-gh-pages@v3.9.3 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: site/target/docs/site diff --git a/build.sbt b/build.sbt index 0e1a260..2deb983 100644 --- a/build.sbt +++ b/build.sbt @@ -5,12 +5,7 @@ lazy val `sbt-circe-org` = ThisBuild / circeRootOfCodeCoverage := None ThisBuild / tlCiScalafixCheck := true -lazy val docs = project - .in(file("site")) - .enablePlugins(CirceOrgSitePlugin) - .settings( - tlSiteRelatedProjects += "sbt-typelevel" -> url("https://typelevel.org/sbt-typelevel/") - ) +lazy val docs = project.in(file("site")).enablePlugins(CirceOrgSitePlugin) lazy val core = project .in(file("core")) @@ -19,7 +14,7 @@ lazy val core = project name := "sbt-circe-org" ) -ThisBuild / tlBaseVersion := "0.1" +ThisBuild / tlBaseVersion := "0.2" ThisBuild / crossScalaVersions := Seq("2.12.18") ThisBuild / developers := List( tlGitHubDev("lorandszakacs", "Loránd Szakács") diff --git a/core/build.sbt b/core/build.sbt index 9dce9ea..bc83995 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -1,9 +1,7 @@ -val sbtTypelevelVersion = "0.4.22" // https://github.com/typelevel/sbt-typelevel/releases +val sbtTypelevelVersion = "0.5.0" // https://github.com/typelevel/sbt-typelevel/releases val sbtScoverageVersion = "2.0.8" // https://github.com/scoverage/sbt-scoverage/releases -val sbtScalaNativeVersion = "0.4.12" // https://github.com/scala-native/scala-native/releases addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion) addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion) addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % sbtTypelevelVersion) -addSbtPlugin("org.scala-native" % "sbt-scala-native" % sbtScalaNativeVersion) addSbtPlugin("org.scoverage" % "sbt-scoverage" % sbtScoverageVersion) diff --git a/core/src/main/resources/io/circe/sbt/site/images/circe_dark.svg b/core/src/main/resources/io/circe/sbt/site/images/circe_dark.svg index 1c8bbbd..ca65e9f 100644 --- a/core/src/main/resources/io/circe/sbt/site/images/circe_dark.svg +++ b/core/src/main/resources/io/circe/sbt/site/images/circe_dark.svg @@ -1,5 +1,5 @@ - + circe Created with Sketch. diff --git a/core/src/main/resources/io/circe/sbt/site/images/circe_light_no_border.svg b/core/src/main/resources/io/circe/sbt/site/images/circe_light_no_border.svg index b0de429..fbedc73 100644 --- a/core/src/main/resources/io/circe/sbt/site/images/circe_light_no_border.svg +++ b/core/src/main/resources/io/circe/sbt/site/images/circe_light_no_border.svg @@ -1,5 +1,5 @@ - + circe Created with Sketch. diff --git a/core/src/main/resources/io/circe/sbt/site/site/styles.css b/core/src/main/resources/io/circe/sbt/site/site/styles.css deleted file mode 100644 index fad1e6c..0000000 --- a/core/src/main/resources/io/circe/sbt/site/site/styles.css +++ /dev/null @@ -1,5 +0,0 @@ -header img { - height: 28px; - width: auto; - margin-top: 6px; -} diff --git a/core/src/main/scala/io/circe/sbt/CirceOrgPlugin.scala b/core/src/main/scala/io/circe/sbt/CirceOrgPlugin.scala index 0d021a4..3a6ad2d 100644 --- a/core/src/main/scala/io/circe/sbt/CirceOrgPlugin.scala +++ b/core/src/main/scala/io/circe/sbt/CirceOrgPlugin.scala @@ -78,7 +78,7 @@ object CirceOrgPlugin extends AutoPlugin { WorkflowJob( id = "coverage", name = "Generate coverage report", - scalas = crossScalaVersions.value.filterNot(_.startsWith("3.")).toList, + scalas = githubWorkflowScalaVersions.value.toList, steps = List(WorkflowStep.Checkout) ++ WorkflowStep.SetupJava( List(githubWorkflowJavaVersions.value.last) ) ++ githubWorkflowGeneratedCacheSteps.value ++ List( diff --git a/core/src/main/scala/io/circe/sbt/CirceOrgSitePlugin.scala b/core/src/main/scala/io/circe/sbt/CirceOrgSitePlugin.scala index dcb44b2..1887c92 100644 --- a/core/src/main/scala/io/circe/sbt/CirceOrgSitePlugin.scala +++ b/core/src/main/scala/io/circe/sbt/CirceOrgSitePlugin.scala @@ -16,19 +16,19 @@ package io.circe.sbt -import laika.ast.LengthUnit._ +import cats.data.NonEmptyList import laika.ast.Path.Root import laika.ast._ -import laika.helium.Helium import laika.helium.config.Favicon import laika.helium.config.HeliumIcon import laika.helium.config.IconLink import laika.helium.config.ImageLink +import laika.helium.config.TextLink +import laika.helium.config.ThemeNavigationSection import laika.sbt.LaikaPlugin import laika.theme.config.Color import org.typelevel.sbt.TypelevelGitHubPlugin import org.typelevel.sbt.TypelevelSitePlugin -import sbt.Keys._ import sbt._ object CirceOrgSitePlugin extends AutoPlugin { @@ -37,57 +37,50 @@ object CirceOrgSitePlugin extends AutoPlugin { import TypelevelGitHubPlugin.autoImport._ import TypelevelSitePlugin.autoImport._ - import LaikaPlugin.autoImport._ - override def projectSettings: Seq[Setting[_]] = Seq( - tlSiteRelatedProjects := { - Seq( - "circe" -> url("https://github.com/circe/circe"), - // streaming helpers - "circe-fs2" -> url("https://github.com/circe/circe-fs2"), - "circe-iteratee" -> url("https://github.com/circe/circe-iteratee"), - // derivation helpers - "circe-generic-extras" -> url("https://github.com/circe/circe-generic-extras"), - "circe-derivation" -> url("https://github.com/circe/circe-derivation"), - // end-user utils - "circe-optics" -> url("https://github.com/circe/circe-optics"), - // 3rd-party integrations - "circe-droste" -> url("https://github.com/circe/circe-droste"), - "circe-spire" -> url("https://github.com/circe/circe-spire"), - "circe-config" -> url("https://github.com/circe/circe-config"), - // other formats - "circe-yaml" -> url("https://github.com/circe/circe-yaml"), - "circe-bson" -> url("https://github.com/circe/circe-bson"), - // schemas - "circe-schema" -> url("https://github.com/circe/circe-schema"), - "circe-golden" -> url("https://github.com/circe/circe-golden"), - "circe-json-schema" -> url("https://github.com/circe/circe-json-schema"), - // other backends - "circe-jackson" -> url("https://github.com/circe/circe-jackson"), - "circe-argus" -> url("https://github.com/circe/circe-argus") - ).filterNot { - case (repo, _) => - tlGitHubRepo.value.contains(repo) // omit ourselves! - } - }, - laikaTheme ~= { _.extend(site.CirceOrgHeliumExtensions) }, - tlSiteHeliumConfig := { - Helium.defaults.all - .metadata( - title = tlGitHubRepo.value, - authors = developers.value.map(_.name), - language = Some("en"), - version = Some(version.value) - ) - .site - .layout( - contentWidth = px(860), - navigationWidth = px(275), - topBarHeight = px(35), - defaultBlockSpacing = px(10), - defaultLineHeight = 1.5, - anchorPlacement = laika.helium.config.AnchorPlacement.Right - ) + private val relatedProjects: Def.Initialize[ThemeNavigationSection] = Def.setting { + val mappings = List( + "circe" -> url("https://github.com/circe/circe"), + // streaming helpers + "circe-fs2" -> url("https://github.com/circe/circe-fs2"), + "circe-iteratee" -> url("https://github.com/circe/circe-iteratee"), + // derivation helpers + "circe-generic-extras" -> url("https://github.com/circe/circe-generic-extras"), + "circe-derivation" -> url("https://github.com/circe/circe-derivation"), + // end-user utils + "circe-optics" -> url("https://github.com/circe/circe-optics"), + // 3rd-party integrations + "circe-droste" -> url("https://github.com/circe/circe-droste"), + "circe-spire" -> url("https://github.com/circe/circe-spire"), + "circe-config" -> url("https://github.com/circe/circe-config"), + // other formats + "circe-yaml" -> url("https://github.com/circe/circe-yaml"), + "circe-bson" -> url("https://github.com/circe/circe-bson"), + // schemas + "circe-schema" -> url("https://github.com/circe/circe-schema"), + "circe-golden" -> url("https://github.com/circe/circe-golden"), + "circe-json-schema" -> url("https://github.com/circe/circe-json-schema"), + // other backends + "circe-jackson" -> url("https://github.com/circe/circe-jackson"), + "circe-argus" -> url("https://github.com/circe/circe-argus") + ).filterNot { + case (repo, _) => + tlGitHubRepo.value.contains(repo) // omit ourselves! + }.map { + case (name, url) => + TextLink.external(url.toString, name) + } + + ThemeNavigationSection( + "Related Projects", + NonEmptyList.fromListUnsafe(mappings) + ) + } + + override lazy val projectSettings = Seq( + tlSiteHelium := { + tlSiteHelium.value + .extendWith(site.CirceOrgHeliumExtensions) .site /* See scaladoc on laika.helium.config.CommonConfigOps#themeColors() * old circe website color theme reference point: @@ -110,23 +103,14 @@ object CirceOrgSitePlugin extends AutoPlugin { .darkMode .disabled .site + .mainNavigation(appendLinks = Seq(relatedProjects.value)) + .site .topNavigationBar( homeLink = ImageLink.external( "https://github.com/circe/circe", Image.internal(Root / "images" / "circe_light_no_border_146x173.png") ), - navLinks = tlSiteApiUrl.value.toList.map { url => - IconLink.external( - url.toString, - HeliumIcon.api, - options = Styles("svg-link") - ) - } ++ Seq( - IconLink.external( - scmInfo.value.fold("https://github.com/circe")(_.browseUrl.toString), - HeliumIcon.github, - options = Styles("svg-link") - ), + navLinks = Seq( IconLink.external("https://discord.gg/XF3CXcMzqD", HeliumIcon.chat) ) ) diff --git a/core/src/main/scala/io/circe/sbt/site/CirceOrgHeliumExtensions.scala b/core/src/main/scala/io/circe/sbt/site/CirceOrgHeliumExtensions.scala index c455f5f..74bec30 100644 --- a/core/src/main/scala/io/circe/sbt/site/CirceOrgHeliumExtensions.scala +++ b/core/src/main/scala/io/circe/sbt/site/CirceOrgHeliumExtensions.scala @@ -17,7 +17,7 @@ package io.circe.sbt.site import cats.effect.Resource -import cats.effect.kernel.Sync +import cats.effect.kernel.Async import laika.ast.Path import laika.io.model.InputTree import laika.theme.Theme @@ -26,32 +26,20 @@ import laika.theme.ThemeProvider object CirceOrgHeliumExtensions extends ThemeProvider { - override def build[F[_]](implicit F: Sync[F]): Resource[F, Theme[F]] = - ThemeBuilder[F]("Circe Helium Extensions") - .addInputs( - InputTree[F].addStream( - F.blocking(getClass.getResourceAsStream("site/styles.css")), - Path.Root / "site" / "styles.css" - ) - ) - .addInputs( - InputTree[F].addStream( - F.blocking(getClass.getResourceAsStream("images/circe_dark.svg")), - Path.Root / "images" / "circe_dark.svg" - ) - ) - .addInputs( - InputTree[F].addStream( - F.blocking(getClass.getResourceAsStream("images/circe_light_no_border.svg")), - Path.Root / "images" / "circe_light_no_border.svg" - ) - ) - .addInputs( - InputTree[F].addStream( - F.blocking(getClass.getResourceAsStream("images/circe_light_no_border_146x173.png")), - Path.Root / "images" / "circe_light_no_border_146x173.png" - ) - ) - .build + private val imageFileNames = Seq( + "circe_dark.svg", + "circe_light_no_border.svg", + "circe_light_no_border_146x173.png" + ) + + override def build[F[_]](implicit F: Async[F]): Resource[F, Theme[F]] = { + + val inputs = imageFileNames.foldLeft(InputTree[F]) { + case (inputTree, fileName) => + inputTree.addClassResource[this.type](s"images/$fileName", Path.Root / "images" / fileName) + } + + ThemeBuilder[F]("circe Images").addInputs(inputs).build + } }