Merge post 1.3.0 release in master

Conflicts:
	package.json

Author: rosen-vladimirov

CHANGELOG.md

@@ -4,6 +4,13 @@ NativeScript CLI Changelog
 1.3.0 (2015, September 16)
 ==
 
+### Breaking
+
+`library add` command is deprecated and will be removed completely in one of our next releases (currently scheduled for 1.5).
+You cannot create NativeScript plugins with Android native code using Eclipse projects. You need to import your Eclipse project into Android Studio, convert it to Gradle build and consume the produced AAR file.
+You cannot use Apache Ant to create new projects for Android but you can continue build your existing Ant-based projects. Starting with NativeScript 1.3, Android builds require Gradle. Run `tns doctor` on the command line to learn more.
+Building NativeScript projects for Android requires Android SDK 22, Android SDK Build-tools 22, Android Support Repository and ANDROID_HOME environment variable set. Run `android` to configure Android SDK.
+
 ### New
 * [Implemented #390](https://github.com/NativeScript/nativescript-cli/issues/390): Support tns_modules from npm.
 * [Implemented #686](https://github.com/NativeScript/nativescript-cli/issues/686): Support building of XCode workspaces.

README.md

@@ -617,3 +617,6 @@ This software is licensed under the Apache 2.0 license, quoted <a href="LICENSE"
 [Gradle 2.3]: https://gradle.org/gradle-download/
 [Android SDK 21]: http://developer.android.com/sdk/index.html
 [Genymotion]: https://www.genymotion.com/#!/
+[CocoaPods 0.38.2]: https://guides.cocoapods.org/using/getting-started.html#getting-started
+[Android SDK Build-tools 22.0.0]: http://developer.android.com/sdk/index.html
+[Android Support Repository]: http://developer.android.com/sdk/index.html

docs/man_pages/index.md

@@ -24,13 +24,12 @@ Command | Description
 [platform list](project/configuration/platform.html) | Lists all platforms that the project currently targets.
 [platform&nbsp;remove&nbsp;`<Platform>`](project/configuration/platform-remove.html) | Removes the selected platform from the platforms that the project currently targets. This operation deletes all platform-specific files and subdirectories from your project.
 [platform update `<Platform>`](project/configuration/platform-update.html) | Updates the NativeScript runtime for the specified platform.
-[library add `<Platform>`](lib-management/library-add.html) | Adds a locally stored native library to the current project.
 [prepare `<Platform>`](project/configuration/prepare.html) | Copies relevant content from the app directory to the subdirectory for the selected target platform to let you build the project.
 [build `<Platform>`](project/testing/build.html) | Builds the project for the selected target platform and produces an application package or an emulator package.
 [deploy `<Platform>`](project/testing/deploy.html) | Deploys the project to a connected physical or virtual device.
 [emulate `<Platform>`](project/testing/emulate.html) | Deploys the project in the native emulator for the selected target platform.
 [run `<Platform>`](project/testing/run.html) | Runs your project on a connected device or in the native emulator, if configured.
-[debug `<Platform>`](project/testing/debug.html) | Debugs your project on a connected device. 
+[debug `<Platform>`](project/testing/debug.html) | Debugs your project on a connected device.
 [install](project/configuration/install.html) | Installs all platforms and dependencies described in the `package.json` file in the current directory.
 [plugin](lib-management/plugin.html) | Lets you manage the plugins for your project.
 [livesync](project/testing/livesync.html) | Synchronizes the latest changes in your project to devices.
@@ -41,7 +40,7 @@ Command | Description
 [device](device/device.html) | Lists all recognized connected physical or virtual devices.
 [device log](device/device-log.html) | Opens the log stream for the selected device.
 [device run](device/device-run.html) | Runs the selected application on a connected device.
-[device list-applications](device/device-list-applications.html) | Lists the installed applications on all connected devices.  
+[device list-applications](device/device-list-applications.html) | Lists the installed applications on all connected devices.
 
 ## Global Options
 Option | Description

lib/android-tools-info.ts

@@ -6,7 +6,7 @@ import * as semver from "semver";
 
 export class AndroidToolsInfo implements IAndroidToolsInfo {
 	private static ANDROID_TARGET_PREFIX = "android";
-	private static SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21", "android-22"];
+	private static SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21", "android-22", "android-23"];
 	private static MIN_REQUIRED_COMPILE_TARGET = 21;
 	private static REQUIRED_BUILD_TOOLS_RANGE_PREFIX = ">=22";
 	private static VERSION_REGEX = /^(\d+\.){2}\d+$/;

lib/services/android-project-service.ts

@@ -141,7 +141,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 			shell.sed('-i', /__TITLE_ACTIVITY__/, this.$projectData.projectName, stringsFilePath);
 
 			let gradleSettingsFilePath = path.join(this.platformData.projectRoot, "settings.gradle");
-			shell.sed('-i', /__PROJECT_NAME__/,  this.$projectData.projectName, gradleSettingsFilePath);
+			shell.sed('-i', /__PROJECT_NAME__/, this.$projectData.projectId.split(".")[2], gradleSettingsFilePath);
 			shell.sed('-i', /__APILEVEL__/, this.$options.sdk || this.$androidToolsInfo.getToolsInfo().wait().compileSdkVersion.toString(), manifestPath);
 		}).future<void>()();
 	}