jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341830 )
Change subject: Hygiene: Remove SDK Manager plugin
......................................................................
Hygiene: Remove SDK Manager plugin
Since version 2.2.0, the Android Gradle plugin should automatically
download packages that a project depends on. In CI, the Jenkins Android
Emulator plugin maintains the SDK. This being the case, there's no longer
any reason to keep the SDK Manager plugin.
Bug: T147099
Change-Id: I9c865b7e3db4146068306c909e5d1d5b047ac698
---
R .sdk/licenses/android-sdk-license
R .sdk/licenses/android-sdk-preview-license
R .sdk/licenses/intel-android-extra-license
M app/build.gradle
M build.gradle
M scripts/apps-android-wikipedia-lint
M scripts/apps-android-wikipedia-periodic-test
M scripts/apps-android-wikipedia-test
8 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/licenses/android-sdk-license b/.sdk/licenses/android-sdk-license
similarity index 100%
rename from licenses/android-sdk-license
rename to .sdk/licenses/android-sdk-license
diff --git a/licenses/android-sdk-preview-license
b/.sdk/licenses/android-sdk-preview-license
similarity index 100%
rename from licenses/android-sdk-preview-license
rename to .sdk/licenses/android-sdk-preview-license
diff --git a/licenses/intel-android-extra-license
b/.sdk/licenses/intel-android-extra-license
similarity index 100%
rename from licenses/intel-android-extra-license
rename to .sdk/licenses/intel-android-extra-license
diff --git a/app/build.gradle b/app/build.gradle
index 7481035..5c262cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
diff --git a/build.gradle b/build.gradle
index 864a3a3..6007258 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,6 @@
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
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'
diff --git a/scripts/apps-android-wikipedia-lint
b/scripts/apps-android-wikipedia-lint
index 58b4ca6..cf6ca52 100755
--- a/scripts/apps-android-wikipedia-lint
+++ b/scripts/apps-android-wikipedia-lint
@@ -1,4 +1,6 @@
#!/usr/bin/env bash
set -euo pipefail
+export ANDROID_HOME="$PWD/.sdk"
+
./gradlew -q clean lintAlphaDebug
\ No newline at end of file
diff --git a/scripts/apps-android-wikipedia-periodic-test
b/scripts/apps-android-wikipedia-periodic-test
index 7e8d9eb..77bad8c 100755
--- a/scripts/apps-android-wikipedia-periodic-test
+++ b/scripts/apps-android-wikipedia-periodic-test
@@ -1,5 +1,8 @@
#!/usr/bin/env bash
set -euo pipefail
+export ANDROID_HOME="$PWD/.sdk"
+
./gradlew clean testAllAlphaRelease
-Pandroid.testInstrumentationRunnerArguments.size=small
-Dorg.gradle.jvmargs=-Xmx4096M -Dorg.gradle.daemon=true
+
scripts/diff-screenshots
\ No newline at end of file
diff --git a/scripts/apps-android-wikipedia-test
b/scripts/apps-android-wikipedia-test
index 347e525..48a32ec 100755
--- a/scripts/apps-android-wikipedia-test
+++ b/scripts/apps-android-wikipedia-test
@@ -2,4 +2,7 @@
set -euo pipefail
scripts/missing-qq.py
+
+export ANDROID_HOME="$PWD/.sdk"
+
./gradlew clean checkstyle assembleAlphaRelease testAlphaRelease
compileAlphaReleaseAndroidTestSources
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/341830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c865b7e3db4146068306c909e5d1d5b047ac698
Gerrit-PatchSet: 7
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
