Merge branch 'master' into eslint-5.5.0

archived-codacy · Oct 14, 2018 · 375359a · 375359a
2 parents 102ded1 + a0f3485
commit 375359a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -37,11 +37,11 @@ jobs:
       - run: 
           name: Test json
           working_directory: ~/codacy-plugins-test
-          command: sbt -Dcodacy.tests.ignore.descriptions=true "run-main codacy.plugins.DockerTest json $CIRCLE_PROJECT_REPONAME:latest"
+          command: sbt -Dcodacy.tests.ignore.descriptions=true "runMain codacy.plugins.DockerTest json $CIRCLE_PROJECT_REPONAME:latest"
       - run:
           name: Test patterns
           working_directory: ~/codacy-plugins-test
-          command: sbt -Dcodacy.tests.noremove=true -Dcodacy.tests.threads=8 "run-main codacy.plugins.DockerTest pattern $CIRCLE_PROJECT_REPONAME:latest"
+          command: sbt -Dcodacy.tests.noremove=true -Dcodacy.tests.threads=8 "runMain codacy.plugins.DockerTest pattern $CIRCLE_PROJECT_REPONAME:latest"
       - deploy:
           name: Push application Docker image
           command: |

diff --git a/build.sbt b/build.sbt
@@ -60,7 +60,7 @@ def installAll(toolVersion: String) =
      |npm install -g eslint-config-loopback@8.0.0 &&
      |npm install -g eslint-config-nodesecurity@1.3.1 &&
      |npm install -g eslint-plugin-node@5.1.1 &&
-     |npm install -g eslint-plugin-promise@3.5.0 &&
+     |npm install -g eslint-plugin-promise@4.0.1 &&
      |npm install -g eslint-plugin-standard@3.0.1 &&
      |npm install -g eslint-config-standard@10.2.1 &&
      |npm install -g eslint-config-strongloop@2.1.0 &&