Merge pull request microsoft#1873 from Microsoft/bumpTo1.5

DanielRosenwasser · DanielRosenwasser · commit ab9ce1e9e663 · 2015-01-30T15:22:05.000-08:00
Bump version to 1.5 (compiler)/0.5 (services)
diff --git a/package.json b/package.json
@@ -1,46 +1,46 @@
 {
-	"name": "typescript",
-	"author": "Microsoft Corp.",
-	"homepage": "http://typescriptlang.org/",
-	"version": "1.4.0",
-	"licenses": [
-		{
-			"type": "Apache License 2.0", 
-			"url": "https://github.com/Microsoft/TypeScript/blob/master/LICENSE.txt"
-		}
-	],
-	"description": "TypeScript is a language for application scale JavaScript development",
-	"keywords": [
-		"TypeScript", 
-		"Microsoft", 
-		"compiler", 
-		"language", 
-		"javascript"
-	],
-	"bugs": {
-		"url" : "https://github.com/Microsoft/TypeScript/issues"
-	},
-	"repository" : { 
-		"type" : "git",	
-		"url" : "https://github.com/Microsoft/TypeScript.git"  
-	},
-	"preferGlobal" : true,
-	"main" : "./bin/typescriptServices.js",
-	"bin" : { 
-		"tsc" : "./bin/tsc" 
-	},
-	"engines" : { 
-		"node" : ">=0.8.0" 
-	},
-	"devDependencies": {
-		"jake" : "latest",
-		"mocha" : "latest",
-		"chai" : "latest",
-		"browserify" : "latest",
-		"istanbul": "latest",
-		"codeclimate-test-reporter": "latest"
-	},
-	"scripts": {
-		"test": "jake generate-code-coverage"
-	}
+    "name": "typescript",
+    "author": "Microsoft Corp.",
+    "homepage": "http://typescriptlang.org/",
+    "version": "1.5.0",
+    "licenses": [
+        {
+            "type": "Apache License 2.0",
+            "url": "https://github.com/Microsoft/TypeScript/blob/master/LICENSE.txt"
+        }
+    ],
+    "description": "TypeScript is a language for application scale JavaScript development",
+    "keywords": [
+        "TypeScript",
+        "Microsoft",
+        "compiler",
+        "language",
+        "javascript"
+    ],
+    "bugs": {
+        "url": "https://github.com/Microsoft/TypeScript/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Microsoft/TypeScript.git"
+    },
+    "preferGlobal": true,
+    "main": "./bin/typescriptServices.js",
+    "bin": {
+        "tsc": "./bin/tsc"
+    },
+    "engines": {
+        "node": ">=0.8.0"
+    },
+    "devDependencies": {
+        "jake": "latest",
+        "mocha": "latest",
+        "chai": "latest",
+        "browserify": "latest",
+        "istanbul": "latest",
+        "codeclimate-test-reporter": "latest"
+    },
+    "scripts": {
+        "test": "jake generate-code-coverage"
+    }
 }
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -2,7 +2,7 @@
 /// <reference path="commandLineParser.ts"/>
 
 module ts {
-    var version = "1.4.0.0";
+    var version = "1.5.0.0";
 
     export interface SourceFile {
         fileWatcher: FileWatcher;
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -9,7 +9,7 @@
 /// <reference path='formatting\smartIndenter.ts' />
 
 module ts {
-    export var servicesVersion = "0.4"
+    export var servicesVersion = "0.5"
 
     export interface Node {
         getSourceFile(): SourceFile;
