fdroidserver 2.2.0__tar.gz → 2.2.2__tar.gz

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [2.2.2] - 2024-04-24
+
+### Added
+
+* Include sdkmanager as dep in setup.py for Homebrew package.
+  https://github.com/Homebrew/homebrew-core/pull/164510
+
+## [2.2.1] - 2023-03-09
+
+### Added
+
+* `download_repo_index_v2()` and `download_repo_index_v2()` API functions
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1323
+
+### Fixed
+
+* Fix OpenJDK detection on different CPU architectures
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1315
+
+### Removed
+
+* Purge all references to `zipalign`, that is delegated to other things
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1316
+* Remove obsolete, unused `buildozer` build type
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1322
+
 ## [2.2.0] - 2023-02-20
 
 ### Added

{fdroidserver-2.2.0/fdroidserver.egg-info → fdroidserver-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.2.0
+Version: 2.2.2
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/fdroidserver/__init__.py

@@ -36,9 +36,13 @@ from fdroidserver.common import (verify_apk_signature,
 verify_apk_signature  # NOQA: B101
 generate_keystore  # NOQA: B101
 from fdroidserver.index import (download_repo_index,
+                                download_repo_index_v1,
+                                download_repo_index_v2,
                                 get_mirror_service_urls,
                                 make as make_index)  # NOQA: E402
 download_repo_index  # NOQA: B101
+download_repo_index_v1  # NOQA: B101
+download_repo_index_v2  # NOQA: B101
 get_mirror_service_urls  # NOQA: B101
 make_index  # NOQA: B101
 from fdroidserver.update import (process_apk,

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/fdroidserver/build.py

@@ -30,7 +30,6 @@ import time
 import requests
 import tempfile
 import argparse
-from configparser import ConfigParser
 import logging
 from gettext import ngettext
 from pathlib import Path
@@ -456,9 +455,6 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
         cmd += ['clean']
         p = FDroidPopen(cmd, cwd=root_dir, envs={"GRADLE_VERSION_DIR": config['gradle_version_dir'], "CACHEDIR": config['cachedir']})
 
-    elif bmethod == 'buildozer':
-        pass
-
     elif bmethod == 'ant':
         logging.info("Cleaning Ant project...")
         p = FDroidPopen(['ant', 'clean'], cwd=root_dir)
@@ -601,73 +597,6 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
 
         bindir = os.path.join(root_dir, 'target')
 
-    elif bmethod == 'buildozer':
-        logging.info("Building Kivy project using buildozer...")
-
-        # parse buildozer.spez
-        spec = os.path.join(root_dir, 'buildozer.spec')
-        if not os.path.exists(spec):
-            raise BuildException("Expected to find buildozer-compatible spec at {0}"
-                                 .format(spec))
-        defaults = {'orientation': 'landscape', 'icon': '',
-                    'permissions': '', 'android.api': "19"}
-        bconfig = ConfigParser(defaults, allow_no_value=True)
-        bconfig.read(spec)
-
-        # update spec with sdk and ndk locations to prevent buildozer from
-        # downloading.
-        loc_ndk = common.env['ANDROID_NDK']
-        loc_sdk = common.env['ANDROID_SDK']
-        if loc_ndk == '$ANDROID_NDK':
-            loc_ndk = loc_sdk + '/ndk-bundle'
-
-        bc_ndk = None
-        bc_sdk = None
-        try:
-            bc_ndk = bconfig.get('app', 'android.sdk_path')
-        except Exception:
-            pass
-        try:
-            bc_sdk = bconfig.get('app', 'android.ndk_path')
-        except Exception:
-            pass
-
-        if bc_sdk is None:
-            bconfig.set('app', 'android.sdk_path', loc_sdk)
-        if bc_ndk is None:
-            bconfig.set('app', 'android.ndk_path', loc_ndk)
-
-        fspec = open(spec, 'w')
-        bconfig.write(fspec)
-        fspec.close()
-
-        logging.info("sdk_path = %s" % loc_sdk)
-        logging.info("ndk_path = %s" % loc_ndk)
-
-        p = None
-        # execute buildozer
-        cmd = ['buildozer', 'android', 'release']
-        try:
-            p = FDroidPopen(cmd, cwd=root_dir)
-        except Exception:
-            pass
-
-        # buidozer not installed ? clone repo and run
-        if (p is None or p.returncode != 0):
-            cmd = ['git', 'clone', 'https://github.com/kivy/buildozer.git']
-            p = subprocess.Popen(cmd, cwd=root_dir, shell=False)
-            p.wait()
-            if p.returncode != 0:
-                raise BuildException("Distribute build failed")
-
-            cmd = ['python', 'buildozer/buildozer/scripts/client.py', 'android', 'release']
-            p = FDroidPopen(cmd, cwd=root_dir)
-
-        # expected to fail.
-        # Signing will fail if not set by environnment vars (cf. p4a docs).
-        # But the unsigned APK will be ok.
-        p.returncode = 0
-
     elif bmethod == 'gradle':
         logging.info("Building Gradle project...")
 
@@ -724,26 +653,6 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
         src = m.group(1)
         src = os.path.join(bindir, src) + '.apk'
 
-    elif omethod == 'buildozer':
-        src = None
-        for apks_dir in [
-                os.path.join(root_dir, '.buildozer', 'android', 'platform', 'build', 'dists', bconfig.get('app', 'title'), 'bin'),
-                ]:
-            for apkglob in ['*-release-unsigned.apk', '*-unsigned.apk', '*.apk']:
-                apks = glob.glob(os.path.join(apks_dir, apkglob))
-
-                if len(apks) > 1:
-                    raise BuildException('More than one resulting apks found in %s' % apks_dir,
-                                         '\n'.join(apks))
-                if len(apks) == 1:
-                    src = apks[0]
-                    break
-            if src is not None:
-                break
-
-        if src is None:
-            raise BuildException('Failed to find any output apks')
-
     elif omethod == 'gradle':
         src = None
         apk_dirs = [

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/fdroidserver/common.py

@@ -202,7 +202,7 @@ def _add_java_paths_to_config(pathlist, thisconfig):
                 r'^java-1\.([126-9][0-9]?)\.0-.*$',  # RedHat
                 r'^java-([126-9][0-9]?)-oracle$',  # Debian WebUpd8
                 r'^jdk-([126-9][0-9]?)-oracle-.*$',  # Debian make-jpkg
-                r'^java-([126-9][0-9]?)-openjdk-[^c][^o][^m].*$',  # Debian
+                r'^java-([126-9][0-9]?)-openjdk-.*$',  # Debian
                 r'^oracle-jdk-bin-1\.([126-9][0-9]?).*$',  # Gentoo (oracle)
                 r'^icedtea-bin-([126-9][0-9]?).*$',  # Gentoo (openjdk)
                 ]:
@@ -962,6 +962,11 @@ def setup_vcs(app):
 
 
 def getvcs(vcstype, remote, local):
+    """Return a vcs instance based on the arguments.
+
+    remote and local can be either a string or a pathlib.Path
+
+    """
     if vcstype == 'git':
         return vcs_git(remote, local)
     if vcstype == 'git-svn':
@@ -971,7 +976,7 @@ def getvcs(vcstype, remote, local):
     if vcstype == 'bzr':
         return vcs_bzr(remote, local)
     if vcstype == 'srclib':
-        if local != Path('build', 'srclib', remote):
+        if str(local) != os.path.join('build', 'srclib', str(remote)):
             raise VCSException("Error: srclib paths are hard-coded!")
         return getsrclib(remote, os.path.join('build', 'srclib'), raw=True)
     if vcstype == 'svn':
@@ -1989,13 +1994,18 @@ def getsrclib(spec, srclib_dir, basepath=False,
               build=None):
     """Get the specified source library.
 
-    Returns the path to it. Normally this is the path to be used when
+    Return the path to it. Normally this is the path to be used when
     referencing it, which may be a subdirectory of the actual project. If
     you want the base directory of the project, pass 'basepath=True'.
 
+    spec and srclib_dir are both strings, not pathlib.Path.
     """
     number = None
     subdir = None
+    if not isinstance(spec, str):
+        spec = str(spec)
+    if not isinstance(srclib_dir, str):
+        spec = str(srclib_dir)
     if raw:
         name = spec
         ref = None
@@ -3220,20 +3230,6 @@ def apk_strip_v1_signatures(signed_apk, strip_manifest=False):
                             out_apk.writestr(ClonedZipInfo(info), buf)
 
 
-def _zipalign(unsigned_apk, aligned_apk):
-    """Run 'zipalign' using standard flags used by Gradle Android Plugin.
-
-    -p was added in build-tools-23.0.0
-
-    References
-    ----------
-    https://developer.android.com/studio/publish/app-signing#sign-manually
-    """
-    p = SdkToolsPopen(['zipalign', '-v', '-p', '4', unsigned_apk, aligned_apk])
-    if p.returncode != 0:
-        raise BuildException("Failed to align application")
-
-
 def apk_implant_signatures(apkpath, outpath, manifest):
     """Implant a signature from metadata into an APK.
 
@@ -3312,7 +3308,7 @@ def get_apksigner_smartcardoptions(smartcardoptions):
 
 
 def sign_apk(unsigned_path, signed_path, keyalias):
-    """Sign and zipalign an unsigned APK, then save to a new file, deleting the unsigned.
+    """Sign an unsigned APK, then save to a new file, deleting the unsigned.
 
     NONE is a Java keyword used to configure smartcards as the
     keystore.  Otherwise, the keystore is a local file.
@@ -3412,13 +3408,45 @@ def verify_apks(signed_apk, unsigned_apk, tmp_dir, v1_only=None):
     return None
 
 
-def verify_deprecated_jar_signature(jar):
+def verify_jar_signature(jar):
     """Verify the signature of a given JAR file.
 
     jarsigner is very shitty: unsigned JARs pass as "verified"! So
     this has to turn on -strict then check for result 4, since this
     does not expect the signature to be from a CA-signed certificate.
 
+    Raises
+    ------
+    VerificationException
+        If the JAR's signature could not be verified.
+
+    """
+    error = _('JAR signature failed to verify: {path}').format(path=jar)
+    try:
+        output = subprocess.check_output(
+            [config['jarsigner'], '-strict', '-verify', jar], stderr=subprocess.STDOUT
+        )
+        raise VerificationException(error + '\n' + output.decode('utf-8'))
+    except subprocess.CalledProcessError as e:
+        if e.returncode == 4:
+            logging.debug(_('JAR signature verified: {path}').format(path=jar))
+        else:
+            raise VerificationException(error + '\n' + e.output.decode('utf-8')) from e
+
+
+def verify_deprecated_jar_signature(jar):
+    """Verify the signature of a given JAR file, allowing deprecated algorithms.
+
+    index.jar (v0) and index-v1.jar are both signed by MD5/SHA1 by
+    definition, so this method provides a way to verify those.  Also,
+    apksigner has different deprecation rules than jarsigner, so this
+    is our current hack to try to represent the apksigner rules when
+    executing jarsigner.
+
+    jarsigner is very shitty: unsigned JARs pass as "verified"! So
+    this has to turn on -strict then check for result 4, since this
+    does not expect the signature to be from a CA-signed certificate.
+
     Also used to verify the signature on an archived APK, supporting deprecated
     algorithms.
 

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/fdroidserver/import_subcommand.py

@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import configparser
 import os
 import re
 import stat
@@ -183,44 +182,6 @@ def get_app_from_url(url):
     return app
 
 
-def check_for_kivy_buildozer(tmp_importer_dir, app, build):
-    versionCode = None
-    buildozer_spec = tmp_importer_dir / 'buildozer.spec'
-    if buildozer_spec.exists():
-        config = configparser.ConfigParser()
-        config.read(buildozer_spec)
-        import pprint
-        pprint.pprint(sorted(config['app'].keys()))
-        app.id = config['app'].get('package.domain')
-        print(app.id)
-        app.AutoName = config['app'].get('package.name', app.AutoName)
-        app.License = config['app'].get('license', app.License)
-        app.Description = config['app'].get('description', app.Description)
-        build.versionName = config['app'].get('version')
-        build.output = 'bin/%s-$$VERSION$$-release-unsigned.apk' % app.AutoName
-        build.ndk = 'r17c'
-        build.srclibs = [
-            'buildozer@586152c',
-            'python-for-android@ccb0f8e1',
-        ]
-        build.sudo = [
-            'apt-get update',
-            'apt-get install -y build-essential libffi-dev libltdl-dev',
-        ]
-        build.prebuild = [
-            'sed -iE "/^[# ]*android\\.(ant|ndk|sdk)_path[ =]/d" buildozer.spec',
-            'sed -iE "/^[# ]*android.accept_sdk_license[ =]+.*/d" buildozer.spec',
-            'sed -iE "/^[# ]*android.skip_update[ =]+.*/d" buildozer.spec',
-            'sed -iE "/^[# ]*p4a.source_dir[ =]+.*/d" buildozer.spec',
-            'sed -i "s,\\[app\\],[app]\\n\\nandroid.sdk_path = $$SDK$$\\nandroid.ndk_path = $$NDK$$\\np4a.source_dir = $$python-for-android$$\\nandroid.accept_sdk_license = False\\nandroid.skip_update = True\\nandroid.ant_path = /usr/bin/ant\\n," buildozer.spec',
-            'pip3 install --user --upgrade $$buildozer$$ Cython==0.28.6',
-        ]
-        build.build = [
-            'PATH="$HOME/.local/bin:$PATH" buildozer android release',
-        ]
-    return build.get('versionName'), versionCode, app.get('id')
-
-
 def main():
 
     global config, options
@@ -287,8 +248,6 @@ def main():
     app.UpdateCheckMode = 'Tags'
     build.commit = common.get_head_commit_id(git_repo)
 
-    versionName, versionCode, appid = check_for_kivy_buildozer(tmp_importer_dir, app, build)
-
     # Extract some information...
     paths = common.get_all_gradle_and_manifests(tmp_importer_dir)
     subdir = common.get_gradle_subdir(tmp_importer_dir, paths)
@@ -300,7 +259,7 @@ def main():
             logging.warning(_('Could not find latest version name'))
         if not versionCode:
             logging.warning(_('Could not find latest version code'))
-    elif not appid:
+    else:
         raise FDroidException(_("No gradle project could be found. Specify --subdir?"))
 
     # Make sure it's actually new...

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/fdroidserver/index.py

@@ -21,6 +21,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import collections
+import hashlib
 import json
 import logging
 import os
@@ -1476,7 +1477,17 @@ def get_mirror_service_urls(url):
 
 
 def download_repo_index(url_str, etag=None, verify_fingerprint=True, timeout=600):
-    """Download and verifies index file, then returns its data.
+    """Download and verifies index v1 file, then returns its data.
+
+    Use the versioned functions to be sure you are getting the
+    expected data format.
+
+    """
+    return download_repo_index_v1(url_str, etag, verify_fingerprint, timeout)
+
+
+def download_repo_index_v1(url_str, etag=None, verify_fingerprint=True, timeout=600):
+    """Download and verifies index v1 file, then returns its data.
 
     Downloads the repository index from the given :param url_str and
     verifies the repository's fingerprint if :param verify_fingerprint
@@ -1489,7 +1500,7 @@ def download_repo_index(url_str, etag=None, verify_fingerprint=True, timeout=600
     Returns
     -------
     A tuple consisting of:
-        - The index in JSON format or None if the index did not change
+        - The index in JSON v1 format or None if the index did not change
         - The new eTag as returned by the HTTP request
 
     """
@@ -1516,15 +1527,78 @@ def download_repo_index(url_str, etag=None, verify_fingerprint=True, timeout=600
     with tempfile.NamedTemporaryFile() as fp:
         fp.write(download)
         fp.flush()
-        index, public_key, public_key_fingerprint = get_index_from_jar(fp.name, fingerprint)
+        index, public_key, public_key_fingerprint = get_index_from_jar(
+            fp.name, fingerprint, allow_deprecated=True
+        )
         index["repo"]["pubkey"] = hexlify(public_key).decode()
         index["repo"]["fingerprint"] = public_key_fingerprint
         index["apps"] = [metadata.App(app) for app in index["apps"]]
         return index, new_etag
 
 
-def get_index_from_jar(jarfile, fingerprint=None):
-    """Return the data, public key, and fingerprint from index-v1.jar.
+def download_repo_index_v2(url_str, etag=None, verify_fingerprint=True, timeout=600):
+    """Download and verifies index v2 file, then returns its data.
+
+    Downloads the repository index from the given :param url_str and
+    verifies the repository's fingerprint if :param verify_fingerprint
+    is not False.  In order to verify the data, the fingerprint must
+    be provided as part of the URL.
+
+    Raises
+    ------
+    VerificationException() if the repository could not be verified
+
+    Returns
+    -------
+    A tuple consisting of:
+        - The index in JSON v2 format or None if the index did not change
+        - The new eTag as returned by the HTTP request
+
+    """
+    url = urllib.parse.urlsplit(url_str)
+
+    fingerprint = None
+    if verify_fingerprint:
+        query = urllib.parse.parse_qs(url.query)
+        if 'fingerprint' not in query:
+            raise VerificationException(_("No fingerprint in URL."))
+        fingerprint = query['fingerprint'][0]
+
+    if url.path.endswith('/entry.jar') or url.path.endswith('/index-v2.json'):
+        path = url.path.rsplit('/', 1)[0]
+    else:
+        path = url.path.rstrip('/')
+
+    url = urllib.parse.SplitResult(url.scheme, url.netloc, path + '/entry.jar', '', '')
+    download, new_etag = net.http_get(url.geturl(), etag, timeout)
+
+    if download is None:
+        return None, new_etag
+
+    # jarsigner is used to verify the JAR, it requires a file for input
+    with tempfile.TemporaryDirectory() as dirname:
+        with (Path(dirname) / 'entry.jar').open('wb') as fp:
+            fp.write(download)
+            fp.flush()
+            entry, public_key, fingerprint = get_index_from_jar(fp.name, fingerprint)
+
+    name = entry['index']['name']
+    sha256 = entry['index']['sha256']
+    url = urllib.parse.SplitResult(url.scheme, url.netloc, path + name, '', '')
+    index, _ignored = net.http_get(url.geturl(), None, timeout)
+    if sha256 != hashlib.sha256(index).hexdigest():
+        raise VerificationException(
+            _("SHA-256 of {url} does not match entry!").format(url=url)
+        )
+    return json.loads(index), new_etag
+
+
+def get_index_from_jar(jarfile, fingerprint=None, allow_deprecated=False):
+    """Return the data, public key and fingerprint from an index JAR with one JSON file.
+
+    The F-Droid index files always contain a single data file and a
+    JAR Signature.  Since index-v1, the data file is always JSON.
+    That single data file is named the same as the JAR file.
 
     Parameters
     ----------
@@ -1537,14 +1611,25 @@ def get_index_from_jar(jarfile, fingerprint=None):
 
     """
     logging.debug(_('Verifying index signature:'))
-    common.verify_deprecated_jar_signature(jarfile)
+
+    if allow_deprecated:
+        common.verify_deprecated_jar_signature(jarfile)
+    else:
+        common.verify_jar_signature(jarfile)
+
     with zipfile.ZipFile(jarfile) as jar:
         public_key, public_key_fingerprint = get_public_key_from_jar(jar)
         if fingerprint is not None:
             fingerprint = re.sub(r'[^0-9A-F]', r'', fingerprint.upper())
             if fingerprint != public_key_fingerprint:
-                raise VerificationException(_("The repository's fingerprint does not match."))
-        data = json.loads(jar.read('index-v1.json').decode())
+                raise VerificationException(
+                    _("The repository's fingerprint does not match.")
+                )
+        for f in jar.namelist():
+            if not f.startswith('META-INF/'):
+                jsonfile = f
+                break
+        data = json.loads(jar.read(jsonfile))
         return data, public_key, public_key_fingerprint
 
 

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/fdroidserver/metadata.py

@@ -225,7 +225,6 @@ build_flags = [
     'patch',
     'gradle',
     'maven',
-    'buildozer',
     'output',
     'binary',
     'srclibs',
@@ -266,7 +265,6 @@ class Build(dict):
         self.patch = []
         self.gradle = []
         self.maven = False
-        self.buildozer = False
         self.output = None
         self.binary = None
         self.srclibs = []
@@ -310,7 +308,7 @@ class Build(dict):
             raise AttributeError("No such attribute: " + name)
 
     def build_method(self):
-        for f in ['maven', 'gradle', 'buildozer']:
+        for f in ['maven', 'gradle']:
             if self.get(f):
                 return f
         if self.output:
@@ -321,7 +319,7 @@ class Build(dict):
     def output_method(self):
         if self.output:
             return 'raw'
-        for f in ['maven', 'gradle', 'buildozer']:
+        for f in ['maven', 'gradle']:
             if self.get(f):
                 return f
         return 'ant'
@@ -656,7 +654,7 @@ def post_metadata_parse(app):
         elif v == [False]:
             return ['no']
 
-    _bool_allowed = ('maven', 'buildozer')
+    _bool_allowed = ('maven')
 
     builds = []
     if 'Builds' in app:
@@ -963,7 +961,7 @@ def write_yaml(mf, app):
                     value = getattr(build, field)
                     if field == 'gradle' and value == ['off']:
                         value = [ruamel.yaml.scalarstring.SingleQuotedScalarString('off')]
-                    if field in ('maven', 'buildozer'):
+                    if field in ('maven'):
                         if value == 'no':
                             continue
                     typ = flagtype(field)

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/fdroidserver/publish.py

@@ -431,7 +431,7 @@ def main():
                                                                       unsigned_dir,
                                                                       output_dir))
 
-                # Sign and zipalign the application...
+                # Sign the application...
                 common.sign_apk(apkfile, signed_apk_path, keyalias)
                 if appid not in signed_apks:
                     signed_apks[appid] = []

{fdroidserver-2.2.0 → fdroidserver-2.2.2/fdroidserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.2.0
+Version: 2.2.2
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/fdroidserver.egg-info/requires.txt

@@ -12,6 +12,7 @@ python-vagrant
 qrcode
 requests!=2.11.0,!=2.12.2,!=2.18.0,>=2.5.2
 ruamel.yaml>=0.15
+sdkmanager>=0.6.4
 yamllint
 
 [docs]

{fdroidserver-2.2.0 → fdroidserver-2.2.2}/gradlew-fdroid

@@ -166,6 +166,7 @@ get_sha() {
         '6.9.1')  echo '8c12154228a502b784f451179846e518733cf856efc7d45b2e6691012977b2fe' ;;
         '6.9.2')  echo '8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f' ;;
         '6.9.3')  echo 'dcf350b8ae1aa192fc299aed6efc77b43825d4fedb224c94118ae7faf5fb035d' ;;
+        '6.9.4')  echo '3e240228538de9f18772a574e99a0ba959e83d6ef351014381acd9631781389a' ;;
         '7.0')    echo 'eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305' ;;
         '7.0.1')  echo 'dccda8aa069563c8ba2f6cdfd0777df0e34a5b4d15138ca8b9757e94f4e8a8cb' ;;
         '7.0.2')  echo '0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c' ;;
@@ -182,8 +183,10 @@ get_sha() {
         '7.5')    echo 'cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2' ;;
         '7.5.1')  echo 'f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4' ;;
         '7.6')    echo '7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b' ;;
+        '7.6.1')  echo '6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87' ;;
         '8.0')    echo '4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788' ;;
         '8.0.1')  echo '1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909' ;;
+        '8.0.2')  echo 'ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7' ;;
         *) exit 1
     esac
 }
@@ -204,7 +207,7 @@ d_plugin_k=(8.0 7.4 7.3 7.2.0 7.1 7.0 4.2 4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.
 d_plugin_v=(8.0 7.5 7.4 7.3.3 7.2 7.0.2 6.7.1 6.5 6.1.1 5.6.4 5.4.1 5.1.1 4.10.1 4.6 4.4 4.1 3.3 2.14.1 2.14.1 2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1  2.1  2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
 
 # All gradle versions we know about
-plugin_v=(8.0.1 8.0 7.6 7.5.1 7.5 7.4.2 7.4.1 7.4 7.3.3 7.3.2 7.3.1 7.3 7.2 7.1.1 7.1 7.0.2 7.0.1 7.0 6.9.3 6.9.2 6.9.1 6.9 6.8.3 6.8.2 6.8.1 6.8 6.7.1 6.7 6.6.1 6.6 6.5.1 6.5 6.4.1 6.4 6.3 6.2.2 6.2.1 6.2 6.1.1 6.1 6.0.1 6.0 5.6.4 5.6.3 5.6.2 5.6.1 5.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 2.0 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4 1.3 1.2 1.1 1.0 0.9.2 0.9.1 0.9 0.8 0.7)
+plugin_v=(8.0.2 8.0.1 8.0 7.6.1 7.6 7.5.1 7.5 7.4.2 7.4.1 7.4 7.3.3 7.3.2 7.3.1 7.3 7.2 7.1.1 7.1 7.0.2 7.0.1 7.0 6.9.4 6.9.3 6.9.2 6.9.1 6.9 6.8.3 6.8.2 6.8.1 6.8 6.7.1 6.7 6.6.1 6.6 6.5.1 6.5 6.4.1 6.4 6.3 6.2.2 6.2.1 6.2 6.1.1 6.1 6.0.1 6.0 5.6.4 5.6.3 5.6.2 5.6.1 5.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 2.0 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4 1.3 1.2 1.1 1.0 0.9.2 0.9.1 0.9 0.8 0.7)
 
 v_all=${plugin_v[@]}