Skip to content

Commit 7dad498

Browse files
authored
Merge pull request #1177 from NativeScript/trifonov/gradle-update
Trifonov/gradle update
2 parents 29294e6 + cff8ff8 commit 7dad498

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

test-app/app/build.gradle

+7-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text
7575
def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 26 }
7676
def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : 26 }
7777
def computeBuildToolsVersion = { ->
78-
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "27.0.3"
78+
project.hasProperty("buildToolsVersion") ? buildToolsVersion : "28.0.2"
7979
}
8080

8181
project.ext.selectedBuildType = project.hasProperty("release") ? "release" : "debug"
@@ -251,6 +251,8 @@ dependencies {
251251
supportVer = supportVersion
252252
}
253253

254+
println "Using support version $supportVer"
255+
254256
implementation "com.android.support:multidex:1.0.2"
255257
implementation "com.android.support:support-v4:$supportVer"
256258
implementation "com.android.support:appcompat-v7:$supportVer"
@@ -477,14 +479,16 @@ task buildMetadata(type: JavaExec) {
477479
description "builds metadata with provided jar dependencies"
478480

479481
inputs.files("$MDG_JAVA_DEPENDENCIES")
480-
inputs.dir("$buildDir/intermediates/classes")
482+
483+
def classesDir = "$buildDir/intermediates/javac"
484+
inputs.dir(classesDir)
481485

482486
outputs.files("$METADATA_OUT_PATH/treeNodeStream.dat", "$METADATA_OUT_PATH/treeStringsStream.dat", "$METADATA_OUT_PATH/treeValueStream.dat")
483487

484488
doFirst {
485489
// get compiled classes to pass to metadata generator
486490
// these need to be called after the classes have compiled
487-
def classesDir = "$buildDir/intermediates/classes"
491+
assert file(classesDir).exists()
488492

489493
def classesSubDirs = new File(classesDir).listFiles()
490494
def selectedBuildType = project.ext.selectedBuildType
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Thu Sep 27 11:34:03 EEST 2018
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

test-app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.4'
10+
classpath 'com.android.tools.build:gradle:3.2.0'
1111
}
1212
}
1313

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri May 11 16:45:47 EEST 2018
1+
#Thu Sep 27 11:34:03 EEST 2018
22
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.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

test-app/runtime/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if (useCCache) {
2020
println "Use CCache build triggered."
2121
}
2222

23-
project.ext._buildToolsVersion = "27.0.3"
23+
project.ext._buildToolsVersion = "28.0.2"
2424

2525
android {
2626
sourceSets {

0 commit comments

Comments
 (0)