From ff3deca4830d184baa95b8b70367bd8c14c7f251 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 22 Nov 2023 15:24:07 +0000 Subject: [PATCH] Updates --- .github/workflows/ci.yml | 230 ++++++++++++++++++++------------------- build.sbt | 26 ++--- docs/index.md | 3 - project/build.properties | 2 +- project/plugins.sbt | 16 +-- 5 files changed, 142 insertions(+), 135 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea30ff5..ceb6bd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,70 +15,56 @@ 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.15, 2.13.11, 3.2.2] + scala: [2.12, 2.13, 3] java: [temurin@8] - project: [rootJS, rootJVM, rootNative] + project: [rediculousJS, rediculousJVM, rediculousNative] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 - if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 8 - - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.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@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - name: Install brew formulae (ubuntu) if: startsWith(matrix.os, 'ubuntu') - run: /home/linuxbrew/.linuxbrew/bin/brew install s2n utf8proc + run: /home/linuxbrew/.linuxbrew/bin/brew install s2n - name: Check that workflows are up to date run: sbt githubWorkflowCheck - name: scalaJSLink - if: matrix.project == 'rootJS' + if: matrix.project == 'rediculousJS' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult - name: nativeLink - if: matrix.project == 'rootNative' + if: matrix.project == 'rediculousNative' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink - name: Test @@ -94,11 +80,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 .js/target core/native/target site/target core/js/target examples/.js/target core/jvm/target .jvm/target .native/target examples/.jvm/target project/target + run: mkdir -p core/native/target core/js/target core/jvm/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 .js/target core/native/target site/target core/js/target examples/.js/target core/jvm/target .jvm/target .native/target examples/.jvm/target project/target + run: tar cf targets.tar core/native/target core/js/target core/jvm/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') @@ -114,195 +100,219 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.11] java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 - if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 8 - - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.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.15, rootJS) + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update + + - name: Download target directories (2.12, rediculousJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculousJS - - name: Inflate target directories (2.12.15, rootJS) + - name: Inflate target directories (2.12, rediculousJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.15, rootJVM) + - name: Download target directories (2.12, rediculousJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculousJVM - - name: Inflate target directories (2.12.15, rootJVM) + - name: Inflate target directories (2.12, rediculousJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.15, rootNative) + - name: Download target directories (2.12, rediculousNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculousNative - - name: Inflate target directories (2.12.15, rootNative) + - name: Inflate target directories (2.12, rediculousNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.11, rootJS) + - name: Download target directories (2.13, rediculousJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculousJS - - name: Inflate target directories (2.13.11, rootJS) + - name: Inflate target directories (2.13, rediculousJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.11, rootJVM) + - name: Download target directories (2.13, rediculousJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculousJVM - - name: Inflate target directories (2.13.11, rootJVM) + - name: Inflate target directories (2.13, rediculousJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.11, rootNative) + - name: Download target directories (2.13, rediculousNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculousNative - - name: Inflate target directories (2.13.11, rootNative) + - name: Inflate target directories (2.13, rediculousNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootJS) + - name: Download target directories (3, rediculousJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculousJS - - name: Inflate target directories (3.2.2, rootJS) + - name: Inflate target directories (3, rediculousJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootJVM) + - name: Download target directories (3, rediculousJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculousJVM - - name: Inflate target directories (3.2.2, rootJVM) + - name: Inflate target directories (3, rediculousJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootNative) + - name: Download target directories (3, rediculousNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculousNative - - name: Inflate target directories (3.2.2, rootNative) + - name: Inflate target directories (3, rediculousNative) run: | tar xf targets.tar rm targets.tar - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' - run: echo $PGP_SECRET | base64 -di | gpg --import + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + run: echo $PGP_SECRET | base64 -d -i - | 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_SECRET" | base64 -d -i - > /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 - run: sbt '++ ${{ matrix.scala }}' tlCiRelease - - site: - name: Generate Site + 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] - scala: [2.13.11] java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 8 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: rediculousjs_2.12 rediculousjs_2.13 rediculousjs_3 rediculousjvm_2.12 rediculousjvm_2.13 rediculousjvm_3 site_2.12 site_2.13 site_3 rediculous-examples_sjs1_2.12 rediculous-examples_sjs1_2.13 rediculous-examples_sjs1_3 rediculousnative_2.12 rediculousnative_2.13 rediculousnative_3 rediculous-examples_2.12 rediculous-examples_2.13 rediculous-examples_3 + configs-ignore: test scala-tool scala-doc-tool test-internal + + site: + name: Generate Site + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@11] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - - name: Cache sbt - uses: actions/cache@v3 + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@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') }} + 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: Generate site - run: sbt '++ ${{ matrix.scala }}' site/tlSite + run: sbt site/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 5165435..f419ac2 100644 --- a/build.sbt +++ b/build.sbt @@ -16,14 +16,14 @@ ThisBuild / tlSonatypeUseLegacyHost := true ThisBuild / githubWorkflowBuildPreamble ++= nativeBrewInstallWorkflowSteps.value -val catsV = "2.9.0" -val catsEffectV = "3.4.8" -val fs2V = "3.6.1" +val catsV = "2.10.0" +val catsEffectV = "3.5.2" +val fs2V = "3.9.3" -val munitCatsEffectV = "2.0.0-M3" +val munitCatsEffectV = "2.0.0-M4" -ThisBuild / crossScalaVersions := Seq("2.12.15","2.13.11", "3.2.2") -ThisBuild / scalaVersion := "2.13.11" +ThisBuild / crossScalaVersions := Seq("2.12.18","2.13.12", "3.3.1") +ThisBuild / scalaVersion := "2.13.12" ThisBuild / versionScheme := Some("early-semver") // Projects @@ -35,7 +35,6 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .in(file("core")) .settings( name := "rediculous", - mimaPreviousArtifacts := Set(), // Bincompat breaking till next release testFrameworks += new TestFramework("munit.Framework"), libraryDependencies ++= Seq( @@ -52,9 +51,9 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) "io.chrisdavenport" %%% "cats-scalacheck" % "0.3.2" % Test, "org.typelevel" %%% "munit-cats-effect" % munitCatsEffectV % Test, - "org.scalameta" %%% "munit-scalacheck" % "1.0.0-M6" % Test, + "org.scalameta" %%% "munit-scalacheck" % "1.0.0-M10" % Test, ), - libraryDependencies += "org.scodec" %%% "scodec-core" % (if (scalaVersion.value.startsWith("2.")) "1.11.10" else "2.2.0") + libraryDependencies += "org.scodec" %%% "scodec-core" % (if (scalaVersion.value.startsWith("2.")) "1.11.10" else "2.2.2") ).jsSettings( scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)} ).jvmSettings( @@ -62,15 +61,15 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) ) .platformsSettings(JVMPlatform, JSPlatform)( libraryDependencies ++= Seq( - "io.chrisdavenport" %%% "whale-tail-manager" % "0.0.8" % Test, + "io.chrisdavenport" %%% "whale-tail-manager" % "0.0.10" % Test, ) ) .nativeEnablePlugins(ScalaNativeBrewedConfigPlugin) .platformsSettings(NativePlatform)( libraryDependencies ++= Seq( - "com.armanbilge" %%% "epollcat" % "0.1.4" % Test + "com.armanbilge" %%% "epollcat" % "0.1.6" % Test ), - Test / nativeBrewFormulas ++= Set("s2n", "utf8proc"), + Test / nativeBrewFormulas ++= Set("s2n"), Test / envVars ++= Map("S2N_DONT_MLOCK" -> "1") ) @@ -83,12 +82,12 @@ lazy val examples = crossProject(JVMPlatform, JSPlatform) .settings( name := "rediculous-examples", run / fork := true, - scalaJSUseMainModuleInitializer := true, ).jsSettings( libraryDependencies ++= Seq( "io.github.cquiroz" %%% "scala-java-time" % "2.4.0" ), Compile / mainClass := Some("BasicExample"), + scalaJSUseMainModuleInitializer := true, scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)}, scalaJSStage := FullOptStage, ) @@ -97,4 +96,5 @@ lazy val examplesJS = examples.js lazy val site = project.in(file("site")) .enablePlugins(TypelevelSitePlugin) + .settings(tlSiteIsTypelevelProject := Some(TypelevelProject.Affiliate)) .dependsOn(core.jvm) diff --git a/docs/index.md b/docs/index.md index 25b2110..6aef5b7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,9 +4,6 @@ REmote DIctionary Client, that's hysterical. ## Quick Start -To use rediculous in an existing SBT project with Scala 2.11 or a later version, add the following dependencies to your -`build.sbt` depending on your needs: - ```scala libraryDependencies ++= Seq( "io.chrisdavenport" %% "rediculous" % "" diff --git a/project/build.properties b/project/build.properties index 22af262..e8a1e24 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 +sbt.version=1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 4920265..5a07a6e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,9 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.19") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.19") -addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.4.19") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.6.2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.1.2") +addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1")