From acbcdc3b2c046d3188b69f563cec7e6e55e5c63f Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 25 Jan 2024 22:14:40 +0100 Subject: [PATCH 1/5] Switch to GitHub actions --- .github/workflows/build-test.yml | 30 ++++++++++++++++++++++ .github/workflows/publish.yml | 44 ++++++++++++++++++++++++++++++++ .travis.yml | 12 --------- 3 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/build-test.yml create mode 100644 .github/workflows/publish.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 0000000..6275e8a --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,30 @@ +name: Check + +on: + pull_request: + + push: + branches: + - main # Check branch after merge + +concurrency: + # Only run once for latest commit per ref and cancel other (previous) runs. + group: ci-${{ github.ref }} + cancel-in-progress: true + +jobs: + tests: + name: Tests + uses: playframework/.github/.github/workflows/cmd.yml@v3 + with: + java: 21, 17, 11, 8 + scala: 2.12.18 + cmd: | + sbt ++$MATRIX_SCALA test ^scripted + + finish: + name: Finish + if: github.event_name == 'pull_request' + needs: # Should be last + - "tests" + uses: playframework/.github/.github/workflows/rtm.yml@v3 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..6a6c3ae --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,44 @@ +name: Publish + +on: + push: + branches: # Snapshots + - main + tags: ["**"] # Releases + +jobs: + publish-artifacts: + name: JDK 8 + runs-on: ubuntu-20.04 + if: ${{ github.repository_owner == 'sbt' }} + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves + fetch-depth: 0 + + - name: Coursier Cache + id: coursier-cache + uses: coursier/cache-action@v6 + + - name: Install Adoptium Temurin OpenJDK + uses: coursier/setup-action@v1 + with: + jvm: adoptium:8 + + - name: Publish artifacts + run: sbt ci-release + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + PGP_SECRET: ${{ secrets.PGP_SECRET }} + + - name: Cleanup before cache + shell: bash + run: | + find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true + find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true + find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true + find $HOME/.sbt -name "*.lock" -delete || true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9ccc459..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -jdk: oraclejdk8 -language: scala -sudo: false -script: sbt ^scripted -cache: - directories: - - $HOME/.ivy2/cache -before_cache: - # Ensure changes to the cache aren't persisted - - rm -rf $HOME/.ivy2/cache/scala_*/sbt_*/com.typesafe.sbt/sbt-stylus - # Delete all ivydata files since ivy touches them on each build - - find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm From 9b3cc386aef72283e0774c3e4476059953fba47b Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 25 Jan 2024 22:36:52 +0100 Subject: [PATCH 2/5] No more sbt 0.13 --- .../main/scala-sbt-0.13/TestReporter.scala | 20 ------------------- .../TestReporter.scala | 0 2 files changed, 20 deletions(-) delete mode 100644 src/sbt-test/sbt-stylus/error-output/project/src/main/scala-sbt-0.13/TestReporter.scala rename src/sbt-test/sbt-stylus/error-output/project/src/main/{scala-sbt-1.0 => scala}/TestReporter.scala (100%) diff --git a/src/sbt-test/sbt-stylus/error-output/project/src/main/scala-sbt-0.13/TestReporter.scala b/src/sbt-test/sbt-stylus/error-output/project/src/main/scala-sbt-0.13/TestReporter.scala deleted file mode 100644 index ee1c0a5..0000000 --- a/src/sbt-test/sbt-stylus/error-output/project/src/main/scala-sbt-0.13/TestReporter.scala +++ /dev/null @@ -1,20 +0,0 @@ -import java.util.concurrent.atomic.AtomicInteger - -import sbt._ - -class TestLogger(target: File) extends Logger { - val unrecognisedInputCount = new AtomicInteger(0) - def trace(t: => Throwable): Unit = {} - def success(message: => String): Unit = {} - def log(level: Level.Value, message: => String): Unit = { - if (level == Level.Error) { - if (message.contains("""ParseError: expected "indent", got "=="""")) { - if (unrecognisedInputCount.addAndGet(1) == 1) { - IO.touch(target / "unrecognised-input-error") - } - } - } - } -} - -class TestReporter(target: File) extends LoggerReporter(-1, new TestLogger(target)) diff --git a/src/sbt-test/sbt-stylus/error-output/project/src/main/scala-sbt-1.0/TestReporter.scala b/src/sbt-test/sbt-stylus/error-output/project/src/main/scala/TestReporter.scala similarity index 100% rename from src/sbt-test/sbt-stylus/error-output/project/src/main/scala-sbt-1.0/TestReporter.scala rename to src/sbt-test/sbt-stylus/error-output/project/src/main/scala/TestReporter.scala From 9d713507cfd0ed57d163d250bfbd4918be003d40 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 25 Jan 2024 22:37:24 +0100 Subject: [PATCH 3/5] update gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9dc7731..c0b4409 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,6 @@ project/plugins/project/ .idea/ .idea_modules/ -.DS_Store \ No newline at end of file +.DS_Store + +.bsp/ From 14c7a26771e3580ee7c8e5175b0af7279e50c825 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 25 Jan 2024 22:37:38 +0100 Subject: [PATCH 4/5] Remove contributing --- CONTRIBUTING.md | 104 ------------------------------------------------ 1 file changed, 104 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 3b4a183..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,104 +0,0 @@ -# Typesafe Project & Developer Guidelines - -These guidelines are meant to be a living document that should be changed and adapted as needed. We encourage changes that makes it easier to achieve our goals in an efficient way. - -These guidelines mainly applies to Typesafe’s “mature” projects - not necessarily to projects of the type ‘collection of scripts’ etc. - -## General Workflow - -This is the process for committing code into master. There are of course exceptions to these rules, for example minor changes to comments and documentation, fixing a broken build etc. - -1. Make sure you have signed the [Typesafe CLA](http://www.typesafe.com/contribute/cla), if not, sign it online. -2. Before starting to work on a feature or a fix, you have to make sure that: - 1. There is a ticket for your work in the project's issue tracker. If not, create it first. - 2. The ticket has been scheduled for the current milestone. - 3. The ticket is estimated by the team. - 4. The ticket have been discussed and prioritized by the team. -3. You should always perform your work in a Git feature branch. The branch should be given a descriptive name that explains its intent. Some teams also like adding the ticket number and/or the [GitHub](http://github.com) user ID to the branch name, these details is up to each of the individual teams. -4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on GitHub. -5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that the maintainers can consist of outside contributors, both within and outside Typesafe. Outside contributors (for example from EPFL or independent committers) are encouraged to participate in the review process, it is not a closed process. -6. After the review you should fix the issues as needed (pushing a new commit for new review etc.), iterating until the reviewers give their thumbs up. -7. Once the code has passed review the Pull Request can be merged into the master branch. - -## Pull Request Requirements - -For a Pull Request to be considered at all it has to meet these requirements: - -1. Live up to the current code standard: - - Not violate [DRY](http://programmer.97things.oreilly.com/wiki/index.php/Don%27t_Repeat_Yourself). - - [Boy Scout Rule](http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule) needs to have been applied. -2. Regardless if the code introduces new features or fixes bugs or regressions, it must have comprehensive tests. -3. The code must be well documented in the Typesafe's standard documentation format (see the ‘Documentation’ section below). -4. Copyright: -All Typesafe projects must include Typesafe copyright notices. Each project can choose between one of two approaches: - 1. All source files in the project must have a Typesafe copyright notice in the file header. - 2. The Notices file for the project includes the Typesafe copyright notice and no other files contain copyright notices. See http://www.apache.org/legal/src-headers.html for instructions for managing this approach for copyrights. - - Other guidelines to follow for copyright notices: - - Use a form of ``Copyright (C) 2011-2014 Typesafe Inc. ``, where the start year is when the project or file was first created and the end year is the last time the project or file was modified. - - Never delete or change existing copyright notices, just add additional info. - - Do not use ``@author`` tags since it does not encourage [Collective Code Ownership](http://www.extremeprogramming.org/rules/collective.html). However, each project should make sure that the contributors gets the credit they deserve—in a text file or page on the project website and in the release notes etc. - -If these requirements are not met then the code should **not** be merged into master, or even reviewed - regardless of how good or important it is. No exceptions. - -## Continuous Integration - -Each project should be configured to use a continuous integration (CI) tool (i.e. a build server ala Jenkins). Typesafe has a Jenkins server farm that can be used. The CI tool should, on each push to master, build the **full** distribution and run **all** tests, and if something fails it should email out a notification with the failure report to the committer and the core team. The CI tool should also be used in conjunction with Typesafe’s Pull Request Validator (discussed below). - -## Documentation - -All documentation should be generated using the sbt-site-plugin, *or* publish artifacts to a repository that can be consumed by the typesafe stack. - -All documentation must abide by the following maxims: - -- Example code should be run as part of an automated test suite. -- Version should be **programmatically** specifiable to the build. -- Generation should be **completely automated** and available for scripting. -- Artifacts that must be included in the Typesafe Stack should be published to a maven “documentation” repository as documentation artifacts. - -All documentation is preferred to be in Typesafe's standard documentation format [reStructuredText](http://doc.akka.io/docs/akka/snapshot/dev/documentation.html) compiled using Typesafe's customized [Sphinx](http://sphinx.pocoo.org/) based documentation generation system, which among other things allows all code in the documentation to be externalized into compiled files and imported into the documentation. - -For more info, or for a starting point for new projects, look at the [Typesafe Documentation Template project](https://github.com/typesafehub/doc-template) - -For larger projects that have invested a lot of time and resources into their current documentation and samples scheme (like for example Play), it is understandable that it will take some time to migrate to this new model. In these cases someone from the project needs to take the responsibility of manual QA and verifier for the documentation and samples. - -## External Dependencies - -All the external runtime dependencies for the project, including transitive dependencies, must have an open source license that is equal to, or compatible with, [Apache 2](http://www.apache.org/licenses/LICENSE-2.0). - -This must be ensured by manually verifying the license for all the dependencies for the project: - -1. Whenever a committer to the project changes a version of a dependency (including Scala) in the build file. -2. Whenever a committer to the project adds a new dependency. -3. Whenever a new release is cut (public or private for a customer). - -Which licenses that are compatible with Apache 2 are defined in [this doc](http://www.apache.org/legal/3party.html#category-a), where you can see that the licenses that are listed under ``Category A`` automatically compatible with Apache 2, while the ones listed under ``Category B`` needs additional action: -> “Each license in this category requires some degree of [reciprocity](http://www.apache.org/legal/3party.html#define-reciprocal); therefore, additional action must be taken in order to minimize the chance that a user of an Apache product will create a derivative work of a reciprocally-licensed portion of an Apache product without being aware of the applicable requirements.” - -Each project must also create and maintain a list of all dependencies and their licenses, including all their transitive dependencies. This can be done in either in the documentation or in the build file next to each dependency. - -## Work In Progress - -It is ok to work on a public feature branch in the GitHub repository. Something that can sometimes be useful for early feedback etc. If so then it is preferable to name the branch accordingly. This can be done by either prefix the name with ``wip-`` as in ‘Work In Progress’, or use hierarchical names like ``wip/..``, ``feature/..`` or ``topic/..``. Either way is fine as long as it is clear that it is work in progress and not ready for merge. This work can temporarily have a lower standard. However, to be merged into master it will have to go through the regular process outlined above, with Pull Request, review etc.. - -Also, to facilitate both well-formed commits and working together, the ``wip`` and ``feature``/``topic`` identifiers also have special meaning. Any branch labelled with ``wip`` is considered “git-unstable” and may be rebased and have its history rewritten. Any branch with ``feature``/``topic`` in the name is considered “stable” enough for others to depend on when a group is working on a feature. - -## Creating Commits And Writing Commit Messages - -Follow these guidelines when creating public commits and writing commit messages. - -1. If your work spans multiple local commits (for example; if you do safe point commits while working in a feature branch or work in a branch for long time doing merges/rebases etc.) then please do not commit it all but rewrite the history by squashing the commits into a single big commit which you write a good commit message for (like discussed in the following sections). For more info read this article: [Git Workflow](http://sandofsky.com/blog/git-workflow.html). Every commit should be able to be used in isolation, cherry picked etc. -2. First line should be a descriptive sentence what the commit is doing. It should be possible to fully understand what the commit does by just reading this single line. It is **not ok** to only list the ticket number, type "minor fix" or similar. Include reference to ticket number, prefixed with #, at the end of the first line. If the commit is a small fix, then you are done. If not, go to 3. -3. Following the single line description should be a blank line followed by an enumerated list with the details of the commit. -4. Add keywords for your commit (depending on the degree of automation we reach, the list may change over time): - * ``Review by @gituser`` - if you want to notify someone on the team. The others can, and are encouraged to participate. - * ``Fix/Fixing/Fixes/Close/Closing/Refs #ticket`` - if you want to mark the ticket as fixed in the issue tracker (Assembla understands this). - * ``backport to _branch name_`` - if the fix needs to be cherry-picked to another branch (like 2.9.x, 2.10.x, etc) - -Example: - - Adding monadic API to Future. Fixes #2731 - - * Details 1 - * Details 2 - * Details 3 From 33c9ec4a7b2e9cdd289305381f9e6ead22831c87 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 25 Jan 2024 22:38:12 +0100 Subject: [PATCH 5/5] Upgrade to latest sbt-js-engine, use sbt-ci-release, change groupId --- README.md | 20 +++++++------- build.sbt | 26 +++++++++++++++++-- project/build.properties | 2 +- project/plugins.sbt | 4 ++- sbt-stylus-tester/build.sbt | 2 +- sbt-stylus-tester/project/build.properties | 2 +- sbt-stylus-tester/project/plugins.sbt | 4 +-- .../com/typesafe/sbt/stylus/SbtStylus.scala | 8 +++--- .../error-output/project/plugins.sbt | 2 +- .../sbt-stylus/normal/project/plugins.sbt | 2 +- .../sbt-stylus/plugins/project/plugins.sbt | 2 +- version.sbt | 1 - 12 files changed, 48 insertions(+), 27 deletions(-) delete mode 100644 version.sbt diff --git a/README.md b/README.md index c529a3c..d2c786c 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ sbt-stylus ========== -[![Build Status](https://api.travis-ci.org/sbt/sbt-stylus.png?branch=master)](https://travis-ci.org/sbt/sbt-stylus) [![Download](https://api.bintray.com/packages/sbt-web/sbt-plugin-releases/sbt-stylus/images/download.svg)](https://bintray.com/sbt-web/sbt-plugin-releases/sbt-stylus/_latestVersion) +[![Build Status](https://github.com/sbt/sbt-stylus/actions/workflows/build-test.yml/badge.svg)](https://github.com/sbt/sbt-stylus/actions/workflows/build-test.yml) -> Note that this plugin is presently only working with an engineType set to Node e.g.: +> Note that this plugin is presently only working with an engineType set to Node e.g. (which is the default if a `node` command can be detected): > `set JsEngineKeys.engineType := JsEngineKeys.EngineType.Node` -Allows stylus to be used from within sbt. Builds on com.typesafe.sbt:js-engine in order to execute the stylus compiler along with +Allows stylus to be used from within sbt. Builds on com.github.sbt:sbt-js-engine in order to execute the stylus compiler along with the scripts to verify. js-engine enables high performance linting given parallelism and native JS engine execution. To use this plugin use the addSbtPlugin command within your project's plugins.sbt (or as a global setting) i.e.: ```scala -addSbtPlugin("com.typesafe.sbt" % "sbt-stylus" % "1.1.0") +addSbtPlugin("com.github.sbt" % "sbt-stylus" % "1.2.0") ``` Your project's build file also needs to enable sbt-web plugins. For example with build.sbt: @@ -31,7 +31,7 @@ plugins | List of extra styles plugins to enable. ## Use Nib: ```scala -StylusKeys.useNib in Assets := true +Assets / StylusKeys.useNib := true ``` ```stylus @@ -63,7 +63,7 @@ StylusKeys.plugins = Vector("nib", "jeet") The following sbt code illustrates how compression can be enabled: ```scala -StylusKeys.compress in Assets := true +Assets / StylusKeys.compress := true ``` ## File filters @@ -73,7 +73,7 @@ that are required for compilation. Beyond just `main.styl`, you can use an expre following: ```scala -includeFilter in (Assets, StylusKeys.stylus) := "foo.styl" | "bar.styl" +(Assets / StylusKeys.stylus / includeFilter := "foo.styl" | "bar.styl" ``` ...where both `foo.styl` and `bar.styl` will be considered for the Stylus compiler. @@ -86,9 +86,7 @@ you may have a convention where any Stylus file starting with an `_` should not include all `.styl` files but exclude any beginning with an `_` you can use the following declaration: ```scala -includeFilter in (Assets, StylusKeys.stylus) := "*.styl" +Assets / StylusKeys.stylus / includeFilter := "*.styl" -excludeFilter in (Assets, StylusKeys.stylus) := "_*.styl" +Assets / StylusKeys.stylus / excludeFilter := "_*.styl" ``` - -© Typesafe Inc., 2014 diff --git a/build.sbt b/build.sbt index 32a3640..d0ebd74 100755 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,20 @@ -name := "sbt-stylus" +lazy val `sbt-stylus` = project in file(".") + +enablePlugins(SbtWebBase) + +sonatypeProfileName := "com.github.sbt.sbt-stylus" // See https://issues.sonatype.org/browse/OSSRH-77819#comment-1203625 + description := "sbt-web plugin for running stylus" +developers += Developer( + "playframework", + "The Play Framework Team", + "contact@playframework.com", + url("https://github.com/playframework") +) + +addSbtJsEngine("1.3.5") + libraryDependencies ++= Seq( "com.typesafe" % "jstranspiler" % "1.0.1", "org.webjars" % "mkdirp" % "0.3.5", @@ -9,4 +23,12 @@ libraryDependencies ++= Seq( "org.webjars" % "when-node" % "3.5.2-3" ) -addSbtJsEngine("1.2.2") +// Customise sbt-dynver's behaviour to make it work with tags which aren't v-prefixed +ThisBuild / dynverVTagPrefix := false + +// Sanity-check: assert that version comes from a tag (e.g. not a too-shallow clone) +// https://github.com/dwijnand/sbt-dynver/#sanity-checking-the-version +Global / onLoad := (Global / onLoad).value.andThen { s => + dynverAssertTagVersion.value + s +} diff --git a/project/build.properties b/project/build.properties index 7b6213b..e8a1e24 100755 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.1 +sbt.version=1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7a1196f..6e4254c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1,3 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-web-build-base" % "1.2.0") +addSbtPlugin("com.github.sbt" % "sbt-web-build-base" % "2.0.2") + +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") diff --git a/sbt-stylus-tester/build.sbt b/sbt-stylus-tester/build.sbt index 4d90efb..cd4def7 100644 --- a/sbt-stylus-tester/build.sbt +++ b/sbt-stylus-tester/build.sbt @@ -1,3 +1,3 @@ lazy val root = (project in file(".")).enablePlugins(SbtWeb) -StylusKeys.useNib in Assets := true \ No newline at end of file +Assets / StylusKeys.useNib := true diff --git a/sbt-stylus-tester/project/build.properties b/sbt-stylus-tester/project/build.properties index c091b86..e8a1e24 100755 --- a/sbt-stylus-tester/project/build.properties +++ b/sbt-stylus-tester/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 +sbt.version=1.9.7 diff --git a/sbt-stylus-tester/project/plugins.sbt b/sbt-stylus-tester/project/plugins.sbt index 4b454a8..a8d6731 100644 --- a/sbt-stylus-tester/project/plugins.sbt +++ b/sbt-stylus-tester/project/plugins.sbt @@ -1,3 +1,3 @@ -lazy val root = Project("plugins", file(".")).dependsOn(plugin) +lazy val plugin = RootProject(file("..").getAbsoluteFile.toURI) -lazy val plugin = file("../").getCanonicalFile.toURI +lazy val root = (project in file(".")).dependsOn(plugin) diff --git a/src/main/scala/com/typesafe/sbt/stylus/SbtStylus.scala b/src/main/scala/com/typesafe/sbt/stylus/SbtStylus.scala index 580a218..19beb04 100644 --- a/src/main/scala/com/typesafe/sbt/stylus/SbtStylus.scala +++ b/src/main/scala/com/typesafe/sbt/stylus/SbtStylus.scala @@ -58,12 +58,12 @@ object SbtStylus extends AutoPlugin { inConfig(Assets)(stylusUnscopedSettings) ++ inConfig(TestAssets)(stylusUnscopedSettings) ++ Seq( - taskMessage in Assets := "Stylus compiling", - taskMessage in TestAssets := "Stylus test compiling" + Assets / taskMessage := "Stylus compiling", + TestAssets / taskMessage := "Stylus test compiling" ) ) ++ SbtJsTask.addJsSourceFileTasks(stylus) ++ Seq( - stylus in Assets := (stylus in Assets).dependsOn(webModules in Assets).value, - stylus in TestAssets := (stylus in TestAssets).dependsOn(webModules in TestAssets).value + Assets / stylus := (Assets / stylus).dependsOn(Assets / webModules).value, + TestAssets / stylus := (TestAssets / stylus).dependsOn(TestAssets / webModules).value ) } diff --git a/src/sbt-test/sbt-stylus/error-output/project/plugins.sbt b/src/sbt-test/sbt-stylus/error-output/project/plugins.sbt index 189b88e..4098940 100644 --- a/src/sbt-test/sbt-stylus/error-output/project/plugins.sbt +++ b/src/sbt-test/sbt-stylus/error-output/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-stylus" % sys.props("project.version")) +addSbtPlugin("com.github.sbt" % "sbt-stylus" % sys.props("project.version")) diff --git a/src/sbt-test/sbt-stylus/normal/project/plugins.sbt b/src/sbt-test/sbt-stylus/normal/project/plugins.sbt index 189b88e..4098940 100644 --- a/src/sbt-test/sbt-stylus/normal/project/plugins.sbt +++ b/src/sbt-test/sbt-stylus/normal/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-stylus" % sys.props("project.version")) +addSbtPlugin("com.github.sbt" % "sbt-stylus" % sys.props("project.version")) diff --git a/src/sbt-test/sbt-stylus/plugins/project/plugins.sbt b/src/sbt-test/sbt-stylus/plugins/project/plugins.sbt index b8b597a..cdc3b05 100644 --- a/src/sbt-test/sbt-stylus/plugins/project/plugins.sbt +++ b/src/sbt-test/sbt-stylus/plugins/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-stylus" % sys.props("project.version")) +addSbtPlugin("com.github.sbt" % "sbt-stylus" % sys.props("project.version")) libraryDependencies += "org.webjars.bower" % "jeet" % "6.1.2" diff --git a/version.sbt b/version.sbt deleted file mode 100644 index ab92045..0000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -version in ThisBuild := "1.1.1-SNAPSHOT"