From 97499d58316bf96f7c9acd625f8abf6d95833ec0 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Mon, 20 Oct 2014 18:55:49 +0200
Subject: [PATCH] Update Wikipedia to 2.0-r-2014-10-14 (84)

---
 metadata/org.wikipedia.txt | 32 ++++++++++++++++----------------
 srclibs/MediaWikiApi.txt   |  2 ++
 2 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 srclibs/MediaWikiApi.txt

diff --git a/metadata/org.wikipedia.txt b/metadata/org.wikipedia.txt
index db6d2def94..4af83de3f4 100644
--- a/metadata/org.wikipedia.txt
+++ b/metadata/org.wikipedia.txt
@@ -13,10 +13,8 @@ Official Wikipedia application.
 [https://github.com/wikimedia/WikipediaMobile/blob/HEAD/CHANGELOG.md CHANGELOG]
 .
 
-#Releases are in their own branch
 Repo Type:git
-#Repo:https://github.com/wikimedia/apps-android-wikipedia.git
-Repo:https://github.com/wikimedia/WikipediaMobile.git
+Repo:https://github.com/wikimedia/apps-android-wikipedia.git
 
 Build:1.0,1
     disable=repo change
@@ -63,6 +61,7 @@ Build:1.3.2,23
     submodules=yes
 
 Build:1.3.4,25
+    disable=repo change
     commit=8e7d8a932
     submodules=yes
     scanignore=Cordova.framework/Cordova
@@ -70,23 +69,24 @@ Build:1.3.4,25
 Build:dev,76
     disable=see notes
     commit=releasesprod/2.0-releasesprod-2014-08-13
+
+Build:2.0-r-2014-10-14,84
+    forceversion=yes
+    commit=r/2.0-r-2014-10-14
     subdir=wikipedia
-    maven=yes
-    prebuild=sed -i -e 's@<version>3.8.2</version>@<version>3.7.0</version>@g' pom.xml ../pom.xml
+    srclibs=MediaWikiApi@32b5b87d0a57900eaa5d7e78d5623cd76f8951b3
+    gradle=prod
+    prebuild=sed -i -e '/wmflabs/d' -e '/jcenter/amavenLocal()' ../build.gradle && \
+        pushd $$MediaWikiApi$$ && $$MVN3$$ install && popd
 
 Maintainer Notes:
-
-1.3.4,25:
-Reenabled old repo and scanignore things that we weren't looking back then.
-
-dev,76:
-* tagging/branching is ridiculous
-* maven > 3.1 required; sed-forcing to 3.0.5 ; check on every release!
-* uses custom maven repo https://tools.wmflabs.org/android-maven-repo/
+* replaced custom maven repo https://tools.wmflabs.org/android-maven-repo/
+* versionname is timebased and generated on build; force it.
+* rework updatechecks
 .
 
 Auto Update Mode:None
-Update Check Mode:Tags ^release
-Current Version:dev
-Current Version Code:76
+Update Check Mode:Tags ^r
+Current Version:${versionStart}-dev-${date}
+Current Version Code:84
 
diff --git a/srclibs/MediaWikiApi.txt b/srclibs/MediaWikiApi.txt
new file mode 100644
index 0000000000..aaf38a0e63
--- /dev/null
+++ b/srclibs/MediaWikiApi.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/wikimedia/apps-android-java-mwapi