mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 06:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for gradle kotlin scripts

Browse source 
https://guides.gradle.org/migrating-build-logic-from-groovy-to-kotlin/
Closes fdroid/fdroidserver#613

cherry-picked from Bubu/fdroidserver@7d2e9f9c
This commit is contained in:
Marcus Hoffmann 2019-12-23 02:02:28 +01:00 • committed by Hans-Christoph Steiner
parent 3de2d0f56f
commit 9ae41cc1ff
5 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
fdroidserver/common.py
View file

@ -1301,7 +1301,8 @@ def manifest_paths(app_dir, flavours):
[os.path.join(app_dir, 'AndroidManifest.xml'),
os.path.join(app_dir, 'src', 'main', 'AndroidManifest.xml'),
os.path.join(app_dir, 'src', 'AndroidManifest.xml'),
os.path.join(app_dir, 'build.gradle')]
os.path.join(app_dir, 'build.gradle'),
os.path.join(app_dir, 'build.gradle.kts')]
for flavour in flavours:
if flavour == 'yes':
@ -1788,9 +1789,15 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
if build.target:
n = build.target.split('-')[1]
build_gradle = os.path.join(root_dir, "build.gradle")
build_gradle_kts = build_gradle + ".kts"
if os.path.exists(build_gradle):
gradlefile = build_gradle
elif os.path.exist(build_gradle_kts):
gradlefile = build_gradle_kts
regsub_file(r'compileSdkVersion[ =]+[0-9]+',
r'compileSdkVersion %s' % n,
os.path.join(root_dir, 'build.gradle'))
gradlefile)
# Remove forced debuggable flags
remove_debuggable_flags(root_dir)
@ -2381,9 +2388,13 @@ gradle_line_matches = [
def remove_signing_keys(build_dir):
for root, dirs, files in os.walk(build_dir):
gradlefile = None
if 'build.gradle' in files:
path = os.path.join(root, 'build.gradle')
gradlefile = "build.gradle"
elif 'build.gradle.kts' in files:
gradlefile = "build.gradle.kts"
if gradlefile:
path = os.path.join(root, gradlefile)
with open(path, "r") as o:
lines = o.readlines()
@ -2421,7 +2432,7 @@ def remove_signing_keys(build_dir):
o.write(line)
if changed:
logging.info("Cleaned build.gradle of keysigning configs at %s" % path)
logging.info("Cleaned %s of keysigning configs at %s" % (gradlefile, path))
for propfile in [
'project.properties',