Skip to content

Commit 6d37e78

Browse files
authored
Merge pull request #3513 from NativeScript/plamen5kov/fix-plugin-builds
Plamen5kov/fix plugin builds
2 parents f1a2995 + 72c92c5 commit 6d37e78

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

lib/services/android-plugin-build-service.ts

+2
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,11 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
253253
const androidToolsInfo = this.$androidToolsInfo.getToolsInfo();
254254
const compileSdk = androidToolsInfo.compileSdkVersion;
255255
const buildToolsVersion = androidToolsInfo.buildToolsVersion;
256+
const supportVersion = androidToolsInfo.supportRepositoryVersion;
256257

257258
localArgs.push(`-PcompileSdk=android-${compileSdk}`);
258259
localArgs.push(`-PbuildToolsVersion=${buildToolsVersion}`);
260+
localArgs.push(`-PsupportVersion=${supportVersion}`);
259261

260262
try {
261263
await this.$childProcess.exec(localArgs.join(" "), { cwd: newPluginDir });

vendor/gradle-plugin/build.gradle

+11-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
buildscript {
33
repositories {
44
jcenter()
5+
google()
56
}
67
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.3.2'
8+
classpath 'com.android.tools.build:gradle:3.0.1'
89

910
// NOTE: Do not place your application dependencies here; they belong
1011
// in the individual module build.gradle files
@@ -40,3 +41,12 @@ android {
4041
versionName "1.0"
4142
}
4243
}
44+
45+
dependencies {
46+
def supportVer = "27.0.1"
47+
if (project.hasProperty("supportVersion")) {
48+
supportVer = supportVersion
49+
}
50+
compileOnly "com.android.support:support-v4:$supportVer"
51+
compileOnly "com.android.support:appcompat-v7:$supportVer"
52+
}

vendor/gradle-plugin/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

0 commit comments

Comments
 (0)