From: relan <email@hidden>
Date: Thu, 8 Mar 2018 12:12:58 +0000 (+0300)
Subject: scanner: support Gradle plugin 3.0 syntax for dependencies
X-Git-Tag: 1.0.3~13^2~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=44d17663fdd85fdda3717b4bf35cecdd151809a8;p=fdroidserver.git

scanner: support Gradle plugin 3.0 syntax for dependencies

See https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#new_configurations
---

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 30552989..272bebd2 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -32,7 +32,13 @@ options = None
 
 
 def get_gradle_compile_commands(build):
-    compileCommands = ['compile', 'releaseCompile']
+    compileCommands = ['compile',          'releaseCompile'
+                       'provided',         'releaseProvided',
+                       'apk',              'releaseApk',
+                       'implementation',   'releaseImplementation',
+                       'api',              'releaseApi',
+                       'compileOnly',      'releaseCompileOnly',
+                       'runtimeOnly',      'releaseRuntimeOnly']
     if build.gradle and build.gradle != ['yes']:
         compileCommands += [flavor + 'Compile' for flavor in build.gradle]
         compileCommands += [flavor + 'ReleaseCompile' for flavor in build.gradle]