From 1595a28926cae1f78ff72a3b8392ff665ed95528 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Fri, 21 May 2021 20:45:23 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.emanuelef.remote_capture.yml |  6 ++++--
 metadata/com.hanntech.free2pass.yml       |  4 ++--
 metadata/com.tailscale.ipn.yml            |  8 +++++---
 metadata/la.daube.photochiotte.yml        |  3 ++-
 metadata/org.openhab.habdroid.beta.yml    | 12 +-----------
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/metadata/com.emanuelef.remote_capture.yml b/metadata/com.emanuelef.remote_capture.yml
index f12009b8bd..8156867544 100644
--- a/metadata/com.emanuelef.remote_capture.yml
+++ b/metadata/com.emanuelef.remote_capture.yml
@@ -163,6 +163,7 @@ Builds:
   - versionName: 1.3.7
     versionCode: 29
     commit: v1.3.7
+    subdir: app
     submodules: true
     sudo:
       - apt-get update || apt-get update
@@ -170,8 +171,9 @@ Builds:
         libpcre2-dev
     gradle:
       - yes
-    output: app/build/outputs/apk/release/app-release-unsigned.apk
-    prebuild: sed -i -e 's/22.0.7026061/22.1.7171670/' app/build.gradle
+    prebuild:
+      - sed -i -e '/3.18.1/d' build.gradle
+      - sed -i -e 's/3.18.1/3.10.2/' src/main/jni/CMakeLists.txt
     ndk: r22b
 
 AutoUpdateMode: Version v%v
diff --git a/metadata/com.hanntech.free2pass.yml b/metadata/com.hanntech.free2pass.yml
index c61973c2a9..f05666bc62 100644
--- a/metadata/com.hanntech.free2pass.yml
+++ b/metadata/com.hanntech.free2pass.yml
@@ -31,7 +31,7 @@ Builds:
 
   - versionName: 1.4.7
     versionCode: 31
-    commit: 1.4.7
+    commit: Release-1.4.7+31
     subdir: android/app
     output: ../../build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
@@ -44,7 +44,7 @@ Builds:
       - $$flutter$$/bin/flutter packages pub get
       - $$flutter$$/bin/flutter build apk --flavor fdroid -t lib/entrypoints/fdroid.entrypoint.dart
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version Release-%v+%c
 UpdateCheckMode: HTTP
 UpdateCheckData: https://gitlab.com/free2pass/free2pass-app/-/raw/main/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 1.4.7
diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml
index 7af62393cf..b7da7b5f10 100644
--- a/metadata/com.tailscale.ipn.yml
+++ b/metadata/com.tailscale.ipn.yml
@@ -211,11 +211,13 @@ Builds:
     subdir: android
     gradle:
       - fdroid
+    prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3'
+        > /dev/null
     build:
-      - curl -Lso go.tar.gz https://golang.org/dl/go1.15.4.linux-amd64.tar.gz
-      - echo "eb61005f0b932c93b424a3a4eaa67d72196c79129d9a3ea8578047683e2c80d5 go.tar.gz"
+      - curl -Lso go.tar.gz https://golang.org/dl/go1.16.4.linux-amd64.tar.gz
+      - echo "7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59 go.tar.gz"
         | sha256sum -c -
-      - tar xzvf go.tar.gz
+      - tar xzf go.tar.gz
       - export ANDROID_SDK_ROOT=$$SDK$$
       - export ANDROID_NDK_ROOT=$$NDK$$
       - PATH=$(pwd)/go/bin:$PATH make -C .. release_aar
diff --git a/metadata/la.daube.photochiotte.yml b/metadata/la.daube.photochiotte.yml
index 11d651db83..8e3d7fed44 100644
--- a/metadata/la.daube.photochiotte.yml
+++ b/metadata/la.daube.photochiotte.yml
@@ -80,13 +80,14 @@ Builds:
       - pip3 install meson==0.56.0
     gradle:
       - flavorA
+    prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
     build:
       - cd ..
       - bash dlbuild.sh all
       - cd app/src/main/cpp
       - cmake -DANDROID_NATIVE_API_LEVEL=21 -DCMAKE_TOOLCHAIN_FILE=$$NDK$$/build/cmake/android.toolchain.cmake
         .
-    ndk: r21d
+    ndk: r21e
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/org.openhab.habdroid.beta.yml b/metadata/org.openhab.habdroid.beta.yml
index 8bd5ba6230..e088a4707c 100644
--- a/metadata/org.openhab.habdroid.beta.yml
+++ b/metadata/org.openhab.habdroid.beta.yml
@@ -2164,16 +2164,6 @@ Builds:
     prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
         -e '/google-services/d' build.gradle
 
-  - versionName: 2.17.1-beta
-    versionCode: 379
-    commit: 2.17.1-beta-fdroid
-    subdir: mobile
-    gradle:
-      - foss
-      - beta
-    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
-        -e '/google-services/d' build.gradle
-
   - versionName: 2.17.2-beta
     versionCode: 380
     commit: 2.17.2-beta-fdroid
@@ -2181,7 +2171,7 @@ Builds:
     gradle:
       - foss
       - beta
-    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /firebase/d
         -e '/google-services/d' build.gradle
 
 MaintainerNotes: Replace the fabric.io maven with mavencentral instead of deleting