mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
Run adapt_gradle before running gradle clean
This commit is contained in:
parent
f8089d3b9e
commit
06668ab1cd
@ -412,6 +412,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
p = FDroidPopen(cmd, cwd=maven_dir)
|
p = FDroidPopen(cmd, cwd=maven_dir)
|
||||||
|
|
||||||
elif thisbuild['type'] == 'gradle':
|
elif thisbuild['type'] == 'gradle':
|
||||||
|
|
||||||
print "Cleaning Gradle project..."
|
print "Cleaning Gradle project..."
|
||||||
cmd = [config['gradle'], 'clean']
|
cmd = [config['gradle'], 'clean']
|
||||||
|
|
||||||
@ -421,6 +422,10 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
else:
|
else:
|
||||||
gradle_dir = root_dir
|
gradle_dir = root_dir
|
||||||
|
|
||||||
|
adapt_gradle(gradle_dir)
|
||||||
|
for name, number, libpath in srclibpaths:
|
||||||
|
adapt_gradle(libpath)
|
||||||
|
|
||||||
p = FDroidPopen(cmd, cwd=gradle_dir)
|
p = FDroidPopen(cmd, cwd=gradle_dir)
|
||||||
|
|
||||||
elif thisbuild['type'] == 'kivy':
|
elif thisbuild['type'] == 'kivy':
|
||||||
@ -607,11 +612,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g',
|
's@compileSdkVersion[ ]*[0-9]*@compileSdkVersion '+level+'@g',
|
||||||
'build.gradle'], cwd=gradle_dir)
|
'build.gradle'], cwd=gradle_dir)
|
||||||
|
|
||||||
adapt_gradle(gradle_dir)
|
|
||||||
|
|
||||||
for name, number, libpath in srclibpaths:
|
|
||||||
adapt_gradle(libpath)
|
|
||||||
|
|
||||||
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
|
if len(flavours) == 1 and flavours[0] in ['main', 'yes', '']:
|
||||||
flavours[0] = ''
|
flavours[0] = ''
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user