From 1d723eab36283d7362d1edd588a104b9cd0a2e67 Mon Sep 17 00:00:00 2001 From: plamen5kov Date: Tue, 3 Apr 2018 11:03:46 +0300 Subject: [PATCH 1/2] fix: pass supportVersion to plugin builds and update gradle --- vendor/gradle-plugin/build.gradle | 12 +++++++++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/vendor/gradle-plugin/build.gradle b/vendor/gradle-plugin/build.gradle index 5171a2e3cc..3a4a89a63d 100644 --- a/vendor/gradle-plugin/build.gradle +++ b/vendor/gradle-plugin/build.gradle @@ -2,9 +2,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -40,3 +41,12 @@ android { versionName "1.0" } } + +dependencies { + def supportVer = "27.0.1" + if (project.hasProperty("supportVersion")) { + supportVer = supportVersion + } + compileOnly "com.android.support:support-v4:$supportVer" + compileOnly "com.android.support:appcompat-v7:$supportVer" +} diff --git a/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties index 55a7a86c65..aa471e9281 100644 --- a/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip From 72c92c5af5903dbacc3c23ab42c7b451be48c5fd Mon Sep 17 00:00:00 2001 From: plamen5kov Date: Tue, 3 Apr 2018 11:26:51 +0300 Subject: [PATCH 2/2] fix: cli passes support version to plugin builds --- lib/services/android-plugin-build-service.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/services/android-plugin-build-service.ts b/lib/services/android-plugin-build-service.ts index 2a5ac66f87..3e71fd57d1 100644 --- a/lib/services/android-plugin-build-service.ts +++ b/lib/services/android-plugin-build-service.ts @@ -253,9 +253,11 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService { const androidToolsInfo = this.$androidToolsInfo.getToolsInfo(); const compileSdk = androidToolsInfo.compileSdkVersion; const buildToolsVersion = androidToolsInfo.buildToolsVersion; + const supportVersion = androidToolsInfo.supportRepositoryVersion; localArgs.push(`-PcompileSdk=android-${compileSdk}`); localArgs.push(`-PbuildToolsVersion=${buildToolsVersion}`); + localArgs.push(`-PsupportVersion=${supportVersion}`); try { await this.$childProcess.exec(localArgs.join(" "), { cwd: newPluginDir });