diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80db90b3a..592dd90f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,38 +1,259 @@ -name: CI +# This file was automatically generated by sbt-github-actions using the +# githubWorkflowGenerate task. You should add and commit this file to +# your git repository. It goes without saying that you shouldn't edit +# this file by hand! Instead, if you wish to make changes, you should +# change your sbt build configuration to revise the workflow description +# to meet your needs, then regenerate this file. + +name: Continuous Integration + on: pull_request: - branches: ['*'] + branches: ['**', '!update/**', '!pr/**'] push: - branches: ['*'] + branches: ['**', '!update/**', '!pr/**'] + tags: [v*] + +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + +concurrency: + group: ${{ github.workflow }} @ ${{ github.ref }} + cancel-in-progress: true + jobs: - test: - runs-on: ubuntu-latest + build: + name: Build and Test + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.12, 2.13, 3] + java: [temurin@8, temurin@17] + project: [rootJS, rootJVM, plugin] + exclude: + - scala: 2.13 + java: temurin@17 + - scala: 3 + java: temurin@17 + - project: rootJS + java: temurin@17 + - project: plugin + java: temurin@17 + - project: plugin + scala: 2.13 + - project: plugin + scala: 3 + runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - - name: Checkout - uses: actions/checkout@v2 + - name: Checkout current branch (full) + uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v10 - with: - java-version: "adopt@1.8" - - - name: Coursier cache - uses: coursier/cache-action@v5 - - - name: sbt cache - uses: actions/cache@v1 - with: - path: $HOME/.sbt - key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - - name: Build and test - run: | - sbt -v +test scalafmtCheckAll docs/mdoc docs/laikaSite scripted - rm -rf "$HOME/.ivy2/local" || true - find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true - find $HOME/.ivy2/cache -name "*-LM-SNAPSHOT*" -delete || true - find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true - find $HOME/.sbt -name "*.lock" -delete || true - \ No newline at end of file + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 8 + cache: sbt + + - 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: Check that workflows are up to date + run: sbt githubWorkflowCheck + + - name: Check formatting + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' scalafmtCheckAll 'project /' scalafmtSbtCheck + + - name: scalaJSLink + if: matrix.project == 'rootJS' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult + + - name: Test + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test + + - name: Check binary compatibility + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues + + - name: Generate API documentation + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc + + - name: Build manual + if: matrix.scala == '2.12' && matrix.project == 'rootJVM' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' docs/mdoc docs/laikaSite + + - name: sbt scripted tests + if: matrix.project == 'plugin' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' plugin/scripted + + - name: Make target directories + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + run: mkdir -p sbt/target pdf/target preview/target core/js/target io/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 sbt/target pdf/target preview/target core/js/target io/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') + uses: actions/upload-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} + path: targets.tar + + publish: + name: Publish Artifacts + needs: [build] + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v3 + 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: temurin + java-version: 8 + cache: sbt + + - 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: Download target directories (2.12, rootJS) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS + + - name: Inflate target directories (2.12, rootJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12, rootJVM) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM + + - name: Inflate target directories (2.12, rootJVM) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12, plugin) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-plugin + + - name: Inflate target directories (2.12, plugin) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13, rootJS) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS + + - name: Inflate target directories (2.13, rootJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13, rootJVM) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM + + - name: Inflate target directories (2.13, rootJVM) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (3, rootJS) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS + + - name: Inflate target directories (3, rootJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (3, rootJVM) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM + + - name: Inflate target directories (3, rootJVM) + 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 + + validate-steward: + name: Validate Steward Config + strategy: + matrix: + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (fast) + uses: actions/checkout@v3 + + - uses: coursier/setup-action@v1 + with: + apps: scala-steward + + - run: scala-steward validate-repo-config .scala-steward.conf diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml new file mode 100644 index 000000000..547aaa43e --- /dev/null +++ b/.github/workflows/clean.yml @@ -0,0 +1,59 @@ +# This file was automatically generated by sbt-github-actions using the +# githubWorkflowGenerate task. You should add and commit this file to +# your git repository. It goes without saying that you shouldn't edit +# this file by hand! Instead, if you wish to make changes, you should +# change your sbt build configuration to revise the workflow description +# to meet your needs, then regenerate this file. + +name: Clean + +on: push + +jobs: + delete-artifacts: + name: Delete Artifacts + runs-on: ubuntu-latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Delete artifacts + run: | + # Customize those three lines with your repository and credentials: + REPO=${GITHUB_API_URL}/repos/${{ github.repository }} + + # A shortcut to call GitHub API. + ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; } + + # A temporary file which receives HTTP response headers. + TMPFILE=/tmp/tmp.$$ + + # An associative array, key: artifact name, value: number of artifacts of that name. + declare -A ARTCOUNT + + # Process all artifacts on this repository, loop on returned "pages". + URL=$REPO/actions/artifacts + while [[ -n "$URL" ]]; do + + # Get current page, get response headers in a temporary file. + JSON=$(ghapi --dump-header $TMPFILE "$URL") + + # Get URL of next page. Will be empty if we are at the last page. + URL=$(grep '^Link:' "$TMPFILE" | tr ',' '\n' | grep 'rel="next"' | head -1 | sed -e 's/.*.*//') + rm -f $TMPFILE + + # Number of artifacts on this page: + COUNT=$(( $(jq <<<$JSON -r '.artifacts | length') )) + + # Loop on all artifacts on this page. + for ((i=0; $i < $COUNT; i++)); do + + # Get name of artifact and count instances of this name. + name=$(jq <<<$JSON -r ".artifacts[$i].name?") + ARTCOUNT[$name]=$(( $(( ${ARTCOUNT[$name]} )) + 1)) + + id=$(jq <<<$JSON -r ".artifacts[$i].id?") + size=$(( $(jq <<<$JSON -r ".artifacts[$i].size_in_bytes?") )) + printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size + ghapi -X DELETE $REPO/actions/artifacts/$id + done + done diff --git a/build.sbt b/build.sbt index 857e2fd2e..1b251082b 100644 --- a/build.sbt +++ b/build.sbt @@ -4,67 +4,44 @@ import sbt.Keys.{ artifactPath, crossScalaVersions } import org.scalajs.linker.interface.ESVersion import Dependencies._ -lazy val basicSettings = Seq( - version := "0.19.3-SNAPSHOT", - homepage := Some(new URL("https://typelevel.org/Laika/")), - organization := "org.planet42", - organizationHomepage := Some(new URL("http://typelevel.org")), - description := "Text Markup Transformer for sbt and Scala applications", - startYear := Some(2012), - licenses := Seq("Apache 2.0" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")), - scalaVersion := versions.scala2_12, - scalacOptions ++= (Opts.compile.encoding("UTF-8") :+ - Opts.compile.deprecation :+ - Opts.compile.unchecked :+ - "-feature" :+ - "-language:implicitConversions" :+ - "-language:postfixOps" :+ - "-language:higherKinds") ++ - (if (priorTo2_13(scalaVersion.value)) Seq("-Ypartial-unification") else Nil) -) - -val mimaPreviousVersions = Set("0.19.0", "0.19.1") - -val previousArtifacts = Seq( - mimaPreviousArtifacts := mimaPreviousVersions - .map(v => projectID.value.withRevision(v).withExplicitArtifacts(Vector.empty)) -) - -def priorTo2_13(version: String): Boolean = - CrossVersion.partialVersion(version) match { - case Some((2, minor)) if minor < 13 => true - case _ => false - } - -lazy val moduleSettings = basicSettings ++ previousArtifacts ++ Seq( - crossScalaVersions := Seq(versions.scala2_12, versions.scala2_13, versions.scala3) -) - -lazy val publishSettings = Seq( - publishMavenStyle := true, - Test / publishArtifact := false, - pomIncludeRepository := { _ => false }, - publishTo := { - if (version.value.trim.endsWith("SNAPSHOT")) None - else Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") - }, - pomExtra := ( - https://github.com/typelevel/Laika.git - scm:git:https://github.com/typelevel/Laika.git - - - - jenshalm - Jens Halm - http://planet42.org - - ) -) - -lazy val noPublishSettings = Seq( - publish := (()), - publishLocal := (()), - publishTo := None +inThisBuild( + Seq( + tlBaseVersion := "1.0", + homepage := Some(new URL("https://typelevel.org/Laika/")), + organization := "org.typelevel", + organizationHomepage := Some(new URL("http://typelevel.org")), + description := "Text Markup Transformer for sbt and Scala applications", + startYear := Some(2012), + licenses := Seq("Apache 2.0" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")), + crossScalaVersions := Seq(versions.scala2_12, versions.scala2_13, versions.scala3), + scalaVersion := versions.scala2_12, + developers := List(Developer("jenshalm", "Jens Halm", "", new URL("http://planet42.org"))), + tlFatalWarnings := false, + tlSkipIrrelevantScalas := true, + tlCiHeaderCheck := false, + tlCiDependencyGraphJob := false, + githubWorkflowJobSetup ~= (_.filterNot(_.name.contains("sbt update"))), + githubWorkflowJavaVersions += JavaSpec.temurin("17"), + githubWorkflowBuildMatrixAdditions ~= { matrix => + matrix + ("project" -> (matrix("project") :+ "plugin")) + }, + githubWorkflowBuildMatrixExclusions ++= { + MatrixExclude(Map("project" -> "plugin", "java" -> JavaSpec.temurin("17").render)) :: + List("2.13", "3").map(scala => MatrixExclude(Map("project" -> "plugin", "scala" -> scala))) + }, + githubWorkflowBuild ++= Seq( + WorkflowStep.Sbt( + List("docs/mdoc", "docs/laikaSite"), + name = Some("Build manual"), + cond = Some("matrix.scala == '2.12' && matrix.project == 'rootJVM'") + ), + WorkflowStep.Sbt( + List("plugin/scripted"), + name = Some("sbt scripted tests"), + cond = Some("matrix.project == 'plugin'") + ) + ) + ) ) val munit = "org.scalameta" %% "munit" % versions.munit % "test" @@ -81,26 +58,25 @@ val http4s = Seq( "org.http4s" %% "http4s-ember-server" % versions.http4s ) -lazy val root = project.in(file(".")) - .aggregate(core.js, core.jvm, pdf, io, preview, plugin) - .settings(basicSettings) - .settings(noPublishSettings) - .enablePlugins(ScalaUnidocPlugin) - .disablePlugins(MimaPlugin) - .settings( - crossScalaVersions := Nil, - ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects( - plugin, - core.js - ) - ) +lazy val root = tlCrossRootProject + .aggregate(core, pdf, io, preview) + .configureRoot { root => + root.aggregate(plugin) // don't include the plugin in rootJVM, only in root + .enablePlugins(ScalaUnidocPlugin) + .settings( + ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects( + plugin, + core.js + ) + ) + } lazy val docs = project.in(file("docs")) .dependsOn(plugin) .enablePlugins(LaikaPlugin) .enablePlugins(MdocPlugin) .enablePlugins(SbtPlugin) - .settings(noPublishSettings) + .enablePlugins(NoPublishPlugin) .settings( name := "laika-docs", laikaTheme := ManualSettings.helium, @@ -119,8 +95,6 @@ lazy val core = crossProject(JSPlatform, JVMPlatform) .withoutSuffixFor(JVMPlatform) .crossType(CrossType.Full) .in(file("core")) - .settings(moduleSettings) - .settings(publishSettings) .settings( name := "laika-core", libraryDependencies ++= Seq( @@ -139,8 +113,6 @@ lazy val core = crossProject(JSPlatform, JVMPlatform) lazy val io = project.in(file("io")) .dependsOn(core.jvm % "compile->compile;test->test") - .settings(moduleSettings) - .settings(publishSettings) .settings( name := "laika-io", libraryDependencies ++= Seq(catsEffect, fs2IO, munit, munitCE3) @@ -148,8 +120,6 @@ lazy val io = project.in(file("io")) lazy val pdf = project.in(file("pdf")) .dependsOn(core.jvm % "compile->compile;test->test", io % "compile->compile;test->test") - .settings(moduleSettings) - .settings(publishSettings) .settings( name := "laika-pdf", libraryDependencies ++= Seq(fop, munit) @@ -157,8 +127,6 @@ lazy val pdf = project.in(file("pdf")) lazy val preview = project.in(file("preview")) .dependsOn(core.jvm, io % "compile->compile;test->test", pdf) - .settings(moduleSettings) - .settings(publishSettings) .settings( name := "laika-preview", libraryDependencies ++= (http4s :+ munit) @@ -167,9 +135,6 @@ lazy val preview = project.in(file("preview")) lazy val plugin = project.in(file("sbt")) .dependsOn(core.jvm, io, pdf, preview) .enablePlugins(SbtPlugin) - .settings(basicSettings) - .settings(previousArtifacts) - .settings(publishSettings) .settings( name := "laika-sbt", sbtPlugin := true, @@ -180,5 +145,11 @@ lazy val plugin = project.in(file("sbt")) "-Duser.language=en", "-Duser.country=GB" ), - scriptedBufferLog := false + scriptedBufferLog := false, + scripted := scripted.dependsOn( + core.jvm / publishLocal, + io / publishLocal, + pdf / publishLocal, + preview / publishLocal + ).evaluated ) diff --git a/core/shared/src/main/scala/laika/parse/css/CSSParsers.scala b/core/shared/src/main/scala/laika/parse/css/CSSParsers.scala index 57afe0c4a..3052c35c6 100644 --- a/core/shared/src/main/scala/laika/parse/css/CSSParsers.scala +++ b/core/shared/src/main/scala/laika/parse/css/CSSParsers.scala @@ -131,7 +131,7 @@ object CSSParsers { val styleDeclarations: Parser[Seq[StyleDeclaration]] = ((selectorGroup <~ wsOrNl ~ "{" ~ wsOrNl) ~ (comment | style).rep <~ (wsOrNl ~ "}")) .mapN { (selectors, stylesAndComments) => - val styles = stylesAndComments collect { case st: Style => (st.name, st.value) } toMap; + val styles = stylesAndComments.collect { case st: Style => (st.name, st.value) }.toMap; selectors map (StyleDeclaration(_, styles)) } diff --git a/core/shared/src/main/scala/laika/rst/bundle/RstExtensionSupport.scala b/core/shared/src/main/scala/laika/rst/bundle/RstExtensionSupport.scala index d6178c4b8..399b87f57 100644 --- a/core/shared/src/main/scala/laika/rst/bundle/RstExtensionSupport.scala +++ b/core/shared/src/main/scala/laika/rst/bundle/RstExtensionSupport.scala @@ -98,6 +98,6 @@ object RstExtension { * and returns them as a map keyed by the name of the extension. */ def createAsMap[P](ext: Seq[RstExtension[P]], recParsers: RecursiveParsers): Map[String, P] = - ext map { e => (e.name.toLowerCase, e.part(recParsers)) } toMap + ext.map { e => (e.name.toLowerCase, e.part(recParsers)) }.toMap } diff --git a/project/build.properties b/project/build.properties index 40b3b8e7b..3c0b78a7c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 78a87e3ab..3933d3e77 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -11,3 +11,5 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1") addSbtPlugin("org.planet42" % "laika-sbt" % "0.19.2") + +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC4") diff --git a/sbt/src/sbt-test/site/ast/project/plugins.sbt b/sbt/src/sbt-test/site/ast/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/ast/project/plugins.sbt +++ b/sbt/src/sbt-test/site/ast/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/choices/project/plugins.sbt b/sbt/src/sbt-test/site/choices/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/choices/project/plugins.sbt +++ b/sbt/src/sbt-test/site/choices/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/config/project/plugins.sbt b/sbt/src/sbt-test/site/config/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/config/project/plugins.sbt +++ b/sbt/src/sbt-test/site/config/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/defaults/project/plugins.sbt b/sbt/src/sbt-test/site/defaults/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/defaults/project/plugins.sbt +++ b/sbt/src/sbt-test/site/defaults/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/directives/project/plugins.sbt b/sbt/src/sbt-test/site/directives/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/directives/project/plugins.sbt +++ b/sbt/src/sbt-test/site/directives/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/docTypeMatcher/project/plugins.sbt b/sbt/src/sbt-test/site/docTypeMatcher/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/docTypeMatcher/project/plugins.sbt +++ b/sbt/src/sbt-test/site/docTypeMatcher/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/epub/project/plugins.sbt b/sbt/src/sbt-test/site/epub/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/epub/project/plugins.sbt +++ b/sbt/src/sbt-test/site/epub/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/excludeFilter/project/plugins.sbt b/sbt/src/sbt-test/site/excludeFilter/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/excludeFilter/project/plugins.sbt +++ b/sbt/src/sbt-test/site/excludeFilter/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/generateASTandFO/project/plugins.sbt b/sbt/src/sbt-test/site/generateASTandFO/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/generateASTandFO/project/plugins.sbt +++ b/sbt/src/sbt-test/site/generateASTandFO/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/generateMultipleFormats/project/plugins.sbt b/sbt/src/sbt-test/site/generateMultipleFormats/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/generateMultipleFormats/project/plugins.sbt +++ b/sbt/src/sbt-test/site/generateMultipleFormats/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/github/project/plugins.sbt b/sbt/src/sbt-test/site/github/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/github/project/plugins.sbt +++ b/sbt/src/sbt-test/site/github/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/html/project/plugins.sbt b/sbt/src/sbt-test/site/html/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/html/project/plugins.sbt +++ b/sbt/src/sbt-test/site/html/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/includeAPI/project/plugins.sbt b/sbt/src/sbt-test/site/includeAPI/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/includeAPI/project/plugins.sbt +++ b/sbt/src/sbt-test/site/includeAPI/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/includeEPUB/project/plugins.sbt b/sbt/src/sbt-test/site/includeEPUB/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/includeEPUB/project/plugins.sbt +++ b/sbt/src/sbt-test/site/includeEPUB/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/includePDF/project/plugins.sbt b/sbt/src/sbt-test/site/includePDF/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/includePDF/project/plugins.sbt +++ b/sbt/src/sbt-test/site/includePDF/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/inputs/project/plugins.sbt b/sbt/src/sbt-test/site/inputs/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/inputs/project/plugins.sbt +++ b/sbt/src/sbt-test/site/inputs/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/packageSite/project/plugins.sbt b/sbt/src/sbt-test/site/packageSite/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/packageSite/project/plugins.sbt +++ b/sbt/src/sbt-test/site/packageSite/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/pdf/project/plugins.sbt b/sbt/src/sbt-test/site/pdf/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/pdf/project/plugins.sbt +++ b/sbt/src/sbt-test/site/pdf/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/rawContent/project/plugins.sbt b/sbt/src/sbt-test/site/rawContent/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/rawContent/project/plugins.sbt +++ b/sbt/src/sbt-test/site/rawContent/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/renderMessageLevel/project/plugins.sbt b/sbt/src/sbt-test/site/renderMessageLevel/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/renderMessageLevel/project/plugins.sbt +++ b/sbt/src/sbt-test/site/renderMessageLevel/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/rewriteRules/project/plugins.sbt b/sbt/src/sbt-test/site/rewriteRules/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/rewriteRules/project/plugins.sbt +++ b/sbt/src/sbt-test/site/rewriteRules/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/siteRenderers/project/plugins.sbt b/sbt/src/sbt-test/site/siteRenderers/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/siteRenderers/project/plugins.sbt +++ b/sbt/src/sbt-test/site/siteRenderers/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/sourceDirectories/project/plugins.sbt b/sbt/src/sbt-test/site/sourceDirectories/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/sourceDirectories/project/plugins.sbt +++ b/sbt/src/sbt-test/site/sourceDirectories/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/strict/project/plugins.sbt b/sbt/src/sbt-test/site/strict/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/strict/project/plugins.sbt +++ b/sbt/src/sbt-test/site/strict/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/targetAPI/project/plugins.sbt b/sbt/src/sbt-test/site/targetAPI/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/targetAPI/project/plugins.sbt +++ b/sbt/src/sbt-test/site/targetAPI/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/targetDir/project/plugins.sbt b/sbt/src/sbt-test/site/targetDir/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/targetDir/project/plugins.sbt +++ b/sbt/src/sbt-test/site/targetDir/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/theme/project/plugins.sbt b/sbt/src/sbt-test/site/theme/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/theme/project/plugins.sbt +++ b/sbt/src/sbt-test/site/theme/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) } diff --git a/sbt/src/sbt-test/site/xslfo/project/plugins.sbt b/sbt/src/sbt-test/site/xslfo/project/plugins.sbt index 4abe07763..e9d576a82 100644 --- a/sbt/src/sbt-test/site/xslfo/project/plugins.sbt +++ b/sbt/src/sbt-test/site/xslfo/project/plugins.sbt @@ -4,5 +4,5 @@ throw new RuntimeException( "The system property 'plugin.version' needs to be defined with scriptedLaunchOpts -D." ) - else addSbtPlugin("org.planet42" % "laika-sbt" % pluginVersion) + else addSbtPlugin("org.typelevel" % "laika-sbt" % pluginVersion) }