Merge branch 'connectbot196' into 'master'

Connectbot - 1.9.6

See merge request fdroid/fdroiddata!6040

metadata/org.connectbot.yml

@@ -146,7 +146,19 @@ Builds:
     prebuild: sed -i -e '/googleImplementation/d' -e 's/androidGitVersion.name()/"1.9.5"/'
         build.gradle
 
+  - versionName: 1.9.6-oss
+    versionCode: 10906000
+    commit: v1.9.6
+    subdir: app
+    patch:
+      - build.patch
+      - settings.patch
+    gradle:
+      - oss
+    prebuild: sed -i -e '/googleImplementation/d' -e 's/androidGitVersion.name()/"1.9.6"/'
+        build.gradle
+
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-CurrentVersion: 1.9.5-oss
-CurrentVersionCode: 10905000
+CurrentVersion: 1.9.6-oss
+CurrentVersionCode: 10906000

metadata/org.connectbot/build.patch

@@ -0,0 +1,47 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,44 +1,24 @@
+ // 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()
+     project.ext.TRANSLATIONS_ONLY = System.getenv("TRANSLATIONS_ONLY")?.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 {
+                 google()
+                 jcenter()
+-                google()
+             }
+         }
+-        repositories {
+-            google()
+-            jcenter()
+-            google()
+-        }
+-    }
+ }
+ 
+ project.ext.preDexLibs = !project.hasProperty('disablePreDex')

metadata/org.connectbot/settings.patch

@@ -0,0 +1,16 @@
+--- a/settings.gradle
++++ b/settings.gradle
+@@ -1,13 +1,6 @@
+ ext.GRADLE_BUILD_CACHE = System.getenv("GRADLE_BUILD_CACHE")?.trim()
+-ext.MAVEN_REPO_CACHE = System.getenv("MAVEN_REPO_CACHE")?.trim()
+ ext.TRANSLATIONS_ONLY = System.getenv("TRANSLATIONS_ONLY")?.trim()
+ 
+-if (MAVEN_REPO_CACHE) {
+-    pluginManagement {
+-        repositories { maven { url MAVEN_REPO_CACHE } }
+-    }
+-}
+-
+ buildCache {
+     local { enabled = !GRADLE_BUILD_CACHE }
+     if (GRADLE_BUILD_CACHE) {