From 8d53a98a3ce8666f22ecb44321381b2ff59dafcc Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Mon, 14 May 2018 11:37:17 +0300 Subject: [PATCH 1/3] feat: Allow using JAVA 8+ Currently in case you have JAVA 9 or 10, CLI does not allow you to build your application. Remove the check for max JAVA version from nativescript-doctor and use the rc version of the package in CLI. --- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6228f052b5..c051dc719f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3812,9 +3812,9 @@ "integrity": "sha512-BZGSYV4YOLxzoTK73l0/s/0sH9l8SHs2ocReMH1f8JYSh5FUWu4ZrKCpJdRkWXV6HFR/pZDz7bwWOVAY07q77g==" }, "nativescript-doctor": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/nativescript-doctor/-/nativescript-doctor-0.12.0.tgz", - "integrity": "sha512-eGEx9MFagJ7i2mtFZv5Jbsg6YQqQsVLxLhmg2uOOjLC253daAkGUBFbPnpEajrqhPZX3PBmoYIh+oHfc9/trjA==", + "version": "0.13.0-rc.0", + "resolved": "https://registry.npmjs.org/nativescript-doctor/-/nativescript-doctor-0.13.0-rc.0.tgz", + "integrity": "sha512-IAQzfxYo1S18TxI0cjh96raV8/1f1cjvX6OIePi9HVKUhL9Oh/GHro33lSkifSpV+jYeFUqk+JODRZZRFukyVA==", "requires": { "osenv": "0.1.3", "semver": "5.3.0", diff --git a/package.json b/package.json index f5f21ee151..592562f63e 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "minimatch": "3.0.2", "mkdirp": "0.5.1", "mute-stream": "0.0.5", - "nativescript-doctor": "0.12.0", + "nativescript-doctor": "0.13.0-rc.0", "open": "0.0.5", "ora": "2.0.0", "osenv": "0.1.3", From 3e2b0b07779ebedb57f12da1ad8b0067217cda55 Mon Sep 17 00:00:00 2001 From: fatme Date: Wed, 16 May 2018 11:12:25 +0300 Subject: [PATCH 2/3] Update gradle --- vendor/gradle-plugin/build.gradle | 4 ++-- vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/gradle-plugin/build.gradle b/vendor/gradle-plugin/build.gradle index 3a4a89a63d..b36fec8932 100644 --- a/vendor/gradle-plugin/build.gradle +++ b/vendor/gradle-plugin/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -28,7 +28,7 @@ apply plugin: 'com.android.library' def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 24 } def computeBuildToolsVersion = { -> - project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.1" + project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.3" } android { diff --git a/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties index aa471e9281..234361767e 100644 --- a/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Dec 21 13:58:00 EET 2017 +#Fri May 11 16:45:47 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip From 2739b17b244a8fb6c2683f5aa6b2575e901e7612 Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Mon, 21 May 2018 11:14:09 +0300 Subject: [PATCH 3/3] chore: Update nativescript-doctor 1.0.0 --- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index c051dc719f..2d06367bd2 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3812,9 +3812,9 @@ "integrity": "sha512-BZGSYV4YOLxzoTK73l0/s/0sH9l8SHs2ocReMH1f8JYSh5FUWu4ZrKCpJdRkWXV6HFR/pZDz7bwWOVAY07q77g==" }, "nativescript-doctor": { - "version": "0.13.0-rc.0", - "resolved": "https://registry.npmjs.org/nativescript-doctor/-/nativescript-doctor-0.13.0-rc.0.tgz", - "integrity": "sha512-IAQzfxYo1S18TxI0cjh96raV8/1f1cjvX6OIePi9HVKUhL9Oh/GHro33lSkifSpV+jYeFUqk+JODRZZRFukyVA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nativescript-doctor/-/nativescript-doctor-1.0.0.tgz", + "integrity": "sha512-QZ/hhDCeenIyVM3e9ly4xqldvsQwpQUv9R6Eqq7EXujysDrOyhRb2o59SbJ14uWRBYVKFILEvls+tqSWdc/wSw==", "requires": { "osenv": "0.1.3", "semver": "5.3.0", diff --git a/package.json b/package.json index 592562f63e..46dc03553d 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "minimatch": "3.0.2", "mkdirp": "0.5.1", "mute-stream": "0.0.5", - "nativescript-doctor": "0.13.0-rc.0", + "nativescript-doctor": "1.0.0", "open": "0.0.5", "ora": "2.0.0", "osenv": "0.1.3",