corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1476165 - Part 2: Update Android Gradle plugin to version 3.1.0. r=nalexander,snorp

Browse Source 
MozReview-Commit-ID: LR1OWncvuwt
This commit is contained in:
Tudor-Gabriel Vîjială
2018-07-17 13:20:19 +01:00
parent 69c1020c1e
commit 2fdae55c4d
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -58,7 +58,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionSha256Sum=5c07b3bac2209fbc98fb1fdf6fd831f72429cdf8c503807404eae03d8c8099e5 distributionSha256Sum=7a2c66d1a78f811d5f37d14630ad21cec5e77a2a4dc61e787e2257a6341016ce

2
mobile/android/geckoview/build.gradle
View File

@@ -224,7 +224,9 @@ android.libraryVariants.all { variant ->
def javadoc = task "javadoc${name.capitalize()}"(type: Javadoc) { def javadoc = task "javadoc${name.capitalize()}"(type: Javadoc) {
description = "Generate Javadoc for build variant $name" description = "Generate Javadoc for build variant $name"
destinationDir = new File(destinationDir, variant.baseName) destinationDir = new File(destinationDir, variant.baseName)
doFirst {
classpath = files(variant.javaCompile.classpath.files) classpath = files(variant.javaCompile.classpath.files)
}
source = files(variant.javaCompile.source) source = files(variant.javaCompile.source)
exclude '**/R.java', '**/BuildConfig.java' exclude '**/R.java', '**/BuildConfig.java'

2
old-configure.in
View File

@@ -2057,7 +2057,7 @@ dnl ========================================================
case "$MOZ_BUILD_APP" in case "$MOZ_BUILD_APP" in
mobile/android) mobile/android)
MOZ_ANDROID_SDK(26, 26, 26.0.2) MOZ_ANDROID_SDK(26, 26, 27.0.3)
;; ;;
esac esac

2
python/mozboot/mozboot/android-packages.txt
View File

@@ -1,5 +1,5 @@
platform-tools platform-tools
build-tools;26.0.2 build-tools;27.0.3
platforms;android-26 platforms;android-26
extras;android;m2repository extras;android;m2repository
extras;google;m2repository extras;google;m2repository

2
taskcluster/scripts/misc/android-gradle-dependencies/after.sh
View File

@@ -5,7 +5,7 @@ set -x -e
echo "running as" $(id) echo "running as" $(id)
: WORKSPACE ${WORKSPACE:=/builds/worker/workspace} : WORKSPACE ${WORKSPACE:=/builds/worker/workspace}
: GRADLE_VERSION ${GRADLE_VERSION:=4.1} : GRADLE_VERSION ${GRADLE_VERSION:=4.4}
set -v set -v