From 68b793e3082fcccf6c122c763a5b3c2841307752 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 13 Feb 2020 09:54:55 +0100 Subject: [PATCH] support kotlin "*.gradle.kts" files in more places closes #613 --- fdroidserver/common.py | 2 +- fdroidserver/import.py | 2 +- fdroidserver/update.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 4fe72fdf..9695e557 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1421,7 +1421,7 @@ def parse_androidmanifests(paths, app): if app.builds and 'gradle' in app.builds[-1] and app.builds[-1].gradle: flavour = app.builds[-1].gradle[-1] - if has_extension(path, 'gradle'): + if path.endswith('.gradle') or path.endswith('.gradle.kts'): with open(path, 'r') as f: android_plugin_file = False inside_flavour_group = 0 diff --git a/fdroidserver/import.py b/fdroidserver/import.py index e1d6ceda..44d6ec32 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -243,7 +243,7 @@ def main(): app.RepoType = 'git' app.UpdateCheckMode = "Tags" - if os.path.exists('build.gradle'): + if os.path.exists('build.gradle') or os.path.exists('build.gradle.kts'): build.gradle = ['yes'] import git diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 44d4b8c0..ae4a4bfa 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -825,9 +825,10 @@ def copy_triple_t_store_metadata(apps): setting_gradle_pattern = re.compile(r"""\s*include\s+["']:([^"']+)["'](?:,[\n\s]*["']:([^"']+)["'])*""") for packageName, app in apps.items(): - settings_gradle = os.path.join('build', packageName, 'settings.gradle') gradle_subdirs = set() - if os.path.exists(settings_gradle): + sg_list = glob.glob(os.path.join('build', packageName, 'settings.gradle*')) + if sg_list: + settings_gradle = sg_list[0] with open(settings_gradle) as fp: data = fp.read() for matches in setting_gradle_pattern.findall(data):