Merge pull request #555 from palantir/release-2.5.0-dev.1

Prepare Release v2.5.0-dev.1
palantir · Aug 6, 2015 · d045263 · d045263
2 parents f9c3161 + 5235cc7
commit d045263
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ===
 
+v2.5.0-dev.1
+---
+* Upgrade TypeScript compiler to v1.6.0-dev.20150805
+* [enhancement] Support `.tsx` syntax (#490)
+
 v2.4.2
 ---
 * [bug] remove npm-shrinkwrap.json from the published package

diff --git a/README.md b/README.md
@@ -9,6 +9,14 @@ TSLint
 
 A linter for the TypeScript language.
 
+"next" distribution
+-------------------
+
+The `next` [branch of the TSLint repo](https://github.com/palantir/tslint/tree/next) tracks the latest TypeScript
+compiler and allows you to lint TS code that uses the latest features of the language. Releases from this branch
+are published to npm with the `next` dist-tag, so you can get the latest dev version of TSLint via
+`npm install tslint@next`.
+
 Installation
 ------------
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "2.4.2",
+  "version": "2.5.0-dev.1",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"

diff --git a/src/tslint.ts b/src/tslint.ts
@@ -37,7 +37,7 @@ module Lint {
         private source: string;
         private options: ILinterOptions;
 
-        public static VERSION = "2.4.2";
+        public static VERSION = "2.5.0-dev.1";
 
         constructor(fileName: string, source: string, options: ILinterOptions) {
             this.fileName = fileName;