Merge branch 'termbot' into 'master'

new TermBot release: 1.9.5-termbot6

See merge request fdroid/fdroiddata!5180

metadata/org.sufficientlysecure.termbot.yml

@@ -1,23 +1,21 @@
 Categories:
   - Internet
-License: Apache-2.0
-WebSite: https://www.openkeychain.org/
-SourceCode: https://github.com/open-keychain/termbot
-IssueTracker: https://github.com/open-keychain/termbot/issues
-Changelog: https://github.com/open-keychain/termbot/blob/HEAD/CHANGELOG.md
-Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=android%40schuermann.eu&lc=US&item_name=OpenKeychain+Donation&no_note=0&no_shipping=1&currency_code=EUR
+License: GPL-3.0-or-later
+WebSite: https://hwsecurity.dev/termbot/
+SourceCode: https://github.com/cotechde/termbot
+IssueTracker: https://github.com/cotechde/termbot/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=android%40schuermann.eu&lc=US&item_name=Termbot+Donation&no_note=0&no_shipping=1&currency_code=EUR
 Bitcoin: 1LY6Hs6SurATjfxnihzLMDUMUuMxvQ4aEi
 
 AutoName: TermBot
 Description: |-
-    Special version of ConnectBot that supports the SSH Authentication API. In
-    combination with OpenKeychain it can use OpenPGP keys.
+    Log into your servers with SSH and authenticate with your Security Keys and
+    OpenPGP cards over NFC and USB.
 
-    This is primarily developed to support authentication subkeys on smart cards and
-    other security tokens over NFC and USB.
+    TermBot is based on ConnectBot and uses the Cotech Hardware Security SDK.
 
 RepoType: git
-Repo: https://github.com/open-keychain/termbot
+Repo: https://github.com/cotechde/termbot
 
 Builds:
   - versionName: 1.9.2-termbot.2
@@ -49,7 +47,20 @@ Builds:
     scandelete:
       - sshlib/publish.gradle
 
-AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags ^v[0-9.]+-termbot[0-9.]+$
-CurrentVersion: 1.9.2-termbot.5
-CurrentVersionCode: 19205
+  - versionName: 1.9.5-termbot8
+    versionCode: 10905077
+    commit: 1.9.5-termbot8
+    subdir: app
+    patch:
+      - build.patch
+    gradle:
+      - oss
+    prebuild:
+      - sed -i -e '/googleImplementation/d' -e 's/androidGitVersion.name()/"1.9.5-termbot8"/'
+        build.gradle
+      - sed -i -e '/MAVEN_REPO_CACHE/,+6d' ../settings.gradle
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags ^[0-9.]+-termbot[0-9.]+$
+CurrentVersion: 1.9.5-termbot8
+CurrentVersionCode: 10905074

metadata/org.sufficientlysecure.termbot/build.patch

@@ -0,0 +1,40 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,30 +1,17 @@
+ // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+ buildscript {
+-    project.ext.MAVEN_REPO_CACHE = System.getenv("MAVEN_REPO_CACHE")?.trim()
+-    if (MAVEN_REPO_CACHE) {
+-        repositories { maven { url MAVEN_REPO_CACHE } }
+-    } else {
+         repositories {
+             google()
+             jcenter()
+             google()
+         }
+     }
+-}
+
+ plugins { id 'com.diffplug.gradle.spotless' version '3.16.0' }
+
+ apply plugin: 'com.diffplug.gradle.spotless'
+
+-if (MAVEN_REPO_CACHE) {
+-    allprojects {
+-        buildscript {
+-            repositories { maven { url MAVEN_REPO_CACHE } }
+-        }
+-        repositories { maven { url MAVEN_REPO_CACHE } }
+-    }
+-} else {
+     allprojects {
+         buildscript {
+             repositories {
+@@ -39,7 +26,6 @@
+             google()
+         }
+     }
+-}
+
+ project.ext.preDexLibs = !project.hasProperty('disablePreDex')