Prepare release v3.1.0-dev.1

Pajn · Nov 25, 2015 · cea5910 · cea5910
1 parent 73e8873
commit cea5910
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ===
 
+v3.1.0-dev.1
+---
+* [bugfix] fixed `no-shadowed-variable` false positives when handling destructuring in function params (#727)
+- [enhancement] `rulesDirectory` in `tslint.json` now supports multiple file paths (#795)
+
 v3.0.0
 ---
 * [bugfix] `member-access` rule now handles object literals and get/set accessors properly (#801)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.0.0",
+  "version": "3.1.0-dev.1",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"
@@ -35,11 +35,11 @@
     "grunt-ts": "^5.1.0",
     "grunt-tslint": "latest",
     "mocha": "^2.2.5",
-    "tslint": "latest",
-    "typescript": "latest"
+    "tslint": "next",
+    "typescript": "next"
   },
   "peerDependencies": {
-    "typescript": ">=1.6.2"
+    "typescript": ">=1.7.0 || >=1.7.0-dev.20151003 || >=1.8.0-dev"
   },
   "license": "Apache-2.0"
 }
diff --git a/src/tslint.ts b/src/tslint.ts
@@ -20,7 +20,7 @@ import {findConfiguration as config} from "./configuration";
 const moduleDirectory = path.dirname(module.filename);
 
 class Linter {
-    public static VERSION = "3.0.0";
+    public static VERSION = "3.1.0-dev.1";
     public static findConfiguration = config;
 
     private fileName: string;

diff --git a/test/tsxTests.ts b/test/tsxTests.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import * as Lint from "./lint";
 
 describe("TSX syntax", () => {
@@ -83,8 +84,7 @@ describe("TSX syntax", () => {
         });
 
         it("with no false positives", () => {
-            // TODO: one false positive exists because of a compiler bug (see #806)
-            assert.lengthOf(actualFailures, 4);
+            assert.lengthOf(actualFailures, 3);
         });
     });