From c71cc4681f12c678693881b98df1efd501a49518 Mon Sep 17 00:00:00 2001
From: missytake <missytake@systemli.org>
Date: Fri, 24 Jan 2020 11:01:39 +0100
Subject: [PATCH] building 1.0.3 worked locally! also, 1.1.1 released

---
 metadata/com.b44t.messenger.yml | 57 +++++++++++++++++++++++++++------
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml
index 57d19c01f2..13155eb216 100644
--- a/metadata/com.b44t.messenger.yml
+++ b/metadata/com.b44t.messenger.yml
@@ -589,9 +589,9 @@ Builds:
     build: $$NDK$$/ndk-build -j `nproc`
     ndk: r14b
 
-  - versionName: 1.0.3
-    versionCode: 571
-    commit: v1.0.3
+  - versionName: 1.1.0
+    versionCode: 572
+    commit: 369f1c4fac89ee85e598b4f2f37bcbbc92f7feaa
     submodules: true
     gradle:
       - fat
@@ -606,21 +606,60 @@ Builds:
       - rustup default $(cat rust-toolchain)
       - rustup target add aarch64-linux-android
       - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"' >> $HOME/.cargo/config
+      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"' 
+        >> $HOME/.cargo/config
       - rustup target add i686-linux-android
       - echo "[target.i686-linux-android]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"' >> $HOME/.cargo/config
+      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"' 
+        >> $HOME/.cargo/config
       - rustup target add armv7-linux-androideabi
       - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"' >> $HOME/.cargo/config
+      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"' 
+        >> $HOME/.cargo/config
       - rustup target add x86_64-linux-android
       - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"' >> $HOME/.cargo/config
+      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"' 
+        >> $HOME/.cargo/config
+      - cd ../..
+      - ./ndk-make.sh
+    ndk: r20b
+
+  - versionName: 1.1.1
+    versionCode: 573
+    commit: v1.1.1
+    submodules: true
+    gradle:
+      - fat
+    srclibs:
+      - rustup@1.21.1
+    prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle
+    build:
+      - cd jni/deltachat-core-rust
+      - ../../$$rustup$$/rustup-init.sh -y
+      - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/
+      - source $HOME/.cargo/env
+      - rustup default $(cat rust-toolchain)
+      - rustup target add aarch64-linux-android
+      - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config
+      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"' 
+        >> $HOME/.cargo/config
+      - rustup target add i686-linux-android
+      - echo "[target.i686-linux-android]" >> $HOME/.cargo/config
+      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"' 
+        >> $HOME/.cargo/config
+      - rustup target add armv7-linux-androideabi
+      - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config
+      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"' 
+        >> $HOME/.cargo/config
+      - rustup target add x86_64-linux-android
+      - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config
+      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"' 
+        >> $HOME/.cargo/config
       - cd ../..
       - ./ndk-make.sh
     ndk: r20b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags ^v[0-9]+\.[0-9]+\.[0-9]+$
-CurrentVersion: 1.0.3
-CurrentVersionCode: 571
+CurrentVersion: 1.1.1
+CurrentVersionCode: 573