Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/341346 )
Change subject: [Dev] Upgrade Gradle Plugin to 2.3.0
......................................................................
[Dev] Upgrade Gradle Plugin to 2.3.0
N.B. This requires dropping the deprecated android-apt and sdk-manager
plugins.
Let's be sure we're ready to drop sdk-manager (see the linked task) before
merging. It was needed for SDK updates in CI but shouldn't be any longer.
Bug: T147099
Change-Id: Ie45aff43badbb448bf35651d26dfeffa22cb0b44
---
M app/build.gradle
M build.gradle
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/46/341346/1
diff --git a/app/build.gradle b/app/build.gradle
index 69bd625..3a034fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,4 @@
-apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
-apply plugin: 'com.neenbedankt.android-apt'
import com.android.build.gradle.internal.dsl.ProductFlavor
import com.android.ddmlib.DdmPreferences
@@ -198,7 +196,7 @@
compile 'net.hockeyapp.android:HockeySDK:4.0.1'
compile 'org.apache.commons:commons-lang3:3.5'
- apt "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
+ annotationProcessor
"com.jakewharton:butterknife-compiler:$butterKnifeVersion"
android.productFlavors.each { flavor ->
String dep
diff --git a/build.gradle b/build.gradle
index 864a3a3..68ffb24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,11 +4,9 @@
maven { url 'https://jitpack.io' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
+ classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.facebook.testing.screenshot:plugin:0.4.2'
- classpath 'com.github.JakeWharton:sdk-manager-plugin:1d07987'
classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7.1'
- classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.1.0'
}
}
--
To view, visit https://gerrit.wikimedia.org/r/341346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie45aff43badbb448bf35651d26dfeffa22cb0b44
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
