Skip to content

Merge release in master #1762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 14, 2016
Merged

Merge release in master #1762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
317e180
Fix add android platform dependencies
TsvetanMilanov May 14, 2016
4aa4e0b
Merge pull request #1760 from NativeScript/milanov/fix-add-android-pl…
TsvetanMilanov May 14, 2016
89c9ead
Merge branch 'release' into vladimirov/merge-rel-master
rosen-vladimirov May 14, 2016
ada3b96
Update to latest common lib
rosen-vladimirov May 14, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/common
Open in desktop
Submodule common updated 24 files
+87 −19 README.md
+31 −0 appbuilder/declarations.d.ts
+6 −6 appbuilder/device-emitter.ts
+2 −0 appbuilder/proton-static-config.ts
+46 −34 appbuilder/services/livesync/livesync-service.ts
+2 −2 definitions/mobile.d.ts
+11 −5 definitions/semver.d.ts
+1 −1 mobile/android/android-application-manager.ts
+3 −35 mobile/application-manager-base.ts
+15 −5 mobile/ios/device/ios-application-manager.ts
+2 −2 mobile/ios/simulator/ios-simulator-application-manager.ts
+29 −34 mobile/mobile-core/devices-service.ts
+1 −1 package.json
+1,097 −4,348 resources/platform-tools/android/darwin/NOTICE.txt
+ − resources/platform-tools/android/darwin/adb
+2,936 −12,386 resources/platform-tools/android/linux/NOTICE.txt
+ − resources/platform-tools/android/linux/adb
+ − resources/platform-tools/android/win32/AdbWinApi.dll
+ − resources/platform-tools/android/win32/AdbWinUsbApi.dll
+2,449 −12,361 resources/platform-tools/android/win32/NOTICE.txt
+ − resources/platform-tools/android/win32/adb.exe
+ − resources/platform-tools/android/win32/fastboot.exe
+13 −9 static-config-base.ts
+18 −9 test/unit-tests/mobile/devices-service.ts
17 changes: 14 additions & 3 deletions lib/services/android-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,23 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
let projectPackageJson: any = this.$fs.readJson(this.$projectData.projectFilePath).wait();

_.each(AndroidProjectService.REQUIRED_DEV_DEPENDENCIES, (dependency: any) => {
let dependencyVersionInProject = projectPackageJson.dependencies[dependency.name] || projectPackageJson.devDependencies[dependency.name];
let dependencyVersionInProject = (projectPackageJson.dependencies && projectPackageJson.dependencies[dependency.name]) ||
(projectPackageJson.devDependencies && projectPackageJson.devDependencies[dependency.name]);

if (!dependencyVersionInProject) {
this.$npm.install(`${dependency.name}@${dependency.version}`, this.$projectData.projectDir, npmConfig).wait();
} else if (!semver.satisfies(dependencyVersionInProject, dependency.version)) {
this.$errors.failWithoutHelp(`Your project have installed ${dependency.name} version ${dependencyVersionInProject} but Android platform requires version ${dependency.version}.`);
} else {
let cleanedVerson = semver.clean(dependencyVersionInProject);

// The plugin version is not valid. Check node_modules for the valid version.
if (!cleanedVerson) {
let pathToPluginPackageJson = path.join(this.$projectData.projectDir, constants.NODE_MODULES_FOLDER_NAME, dependency.name, constants.PACKAGE_JSON_FILE_NAME);
dependencyVersionInProject = this.$fs.exists(pathToPluginPackageJson).wait() && this.$fs.readJson(pathToPluginPackageJson).wait().version;
}

if (!semver.satisfies(dependencyVersionInProject || cleanedVerson, dependency.version)) {
this.$errors.failWithoutHelp(`Your project have installed ${dependency.name} version ${cleanedVerson} but Android platform requires version ${dependency.version}.`);
}
}
});
} else {
Expand Down