From 6febcb924f861732e9118414c05b9890636190c3 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <gitlab.com@schildbach.de>
Date: Thu, 17 Oct 2019 15:28:55 +0000
Subject: [PATCH] =?UTF-8?q?Update=20=C3=96ffi=20to=2011.0.1=20(661)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With major version 11, these changes affect the F-Droid build:

- Öffi has updated Android Gradle plugin to version 3.1.0. Since that
  version does not build reproducibly any more, we use the "disorderfs
  trick" to mitigate against this.
- Since Öffi now uses build flavors for its different versions, Gradle is
  instructed to pick the AOSP flavor.
- Lastly, we use "gradle wrapper" to specify the exact Gradle version to
  use, rather than patching the build.gradle.
---
 metadata/de.schildbach.oeffi.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/metadata/de.schildbach.oeffi.yml b/metadata/de.schildbach.oeffi.yml
index 971e0749b4..0acbbb94eb 100644
--- a/metadata/de.schildbach.oeffi.yml
+++ b/metadata/de.schildbach.oeffi.yml
@@ -153,5 +153,31 @@ Builds:
     prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"4.4.1\" }' >>\
         \ ../build.gradle"
 
+  - versionName: 10.5.9-aosp
+    versionCode: 653
+    commit: v10.5.9
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"4.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 11.0.1-aosp
+    versionCode: 661
+    commit: v11.0.1
+    subdir: oeffi
+    submodules: true
+    init:
+      - cd ../..
+      - mv de.schildbach.oeffi de.schildbach.oeffi_underlying
+      - mkdir de.schildbach.oeffi
+      - disorderfs --sort-dirents=yes --reverse-dirents=no de.schildbach.oeffi_underlying
+        de.schildbach.oeffi
+      - cd de.schildbach.oeffi/oeffi
+    gradle:
+      - aosp
+    prebuild: gradle :wrapper --gradle-version=4.4.1
+
 AutoUpdateMode: None
 UpdateCheckMode: None