diff --git a/.gitignore b/.gitignore index 98c5b90b..84ee6344 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ README.rst # editor tmp files .*.swp +.ropeproject/ # files generated by tests tmp/ diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index d4f14c05..60f97729 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -68,6 +68,8 @@ NON_FREE_GRADLE_LINES = { r'google.*admob', r'google.*play.*services', r'com.google.android.play:core.*', + r'com.google.android.play:app-update', + r'com.google.android.libraries.places:places', r'com.google.mlkit', r'com.android.billingclient', r'androidx.work:work-gcm', @@ -92,6 +94,17 @@ NON_FREE_GRADLE_LINES = { r'io.github.sinaweibosdk', r'com.umeng.umsdk', r'com.google.android.exoplayer:extension-cast', + r'io.objectbox:objectbox-gradle-plugin', + r'com.evernote:android-job', + r'com.yayandroid:LocationManager', + r'com.onesignal:OneSignal', + r'com.cloudinary:cloudinary-android', + r'com.google.android.exoplayer:extension-cronet', + r'com.anjlab.android.iab.v3:library', + r'com.github.penn5:donations', + r'com.mapbox', + r'com.yandex.android', + r'com.hypertrack', ] } @@ -234,8 +247,10 @@ def scan_source(build_dir, build=metadata.Build()): allowlisted = [ 'firebase-jobdispatcher', # https://github.com/firebase/firebase-jobdispatcher-android/blob/master/LICENSE - 'com.firebaseui', # https://github.com/firebase/FirebaseUI-Android/blob/master/LICENSE - 'geofire-android' # https://github.com/firebase/geofire-java/blob/master/LICENSE + 'com.firebaseui', # https://github.com/firebase/FirebaseUI-Android/blob/master/LICENSE + 'geofire-android', # https://github.com/firebase/geofire-java/blob/master/LICENSE + 'com.yandex.android:authsdk', # https://github.com/yandexmobile/yandex-login-sdk-android/blob/master/LICENSE.txt + 'com.hypertrack:hyperlog', # https://github.com/hypertrack/hyperlog-android#license ] def is_allowlisted(s): diff --git a/tests/scanner.TestCase b/tests/scanner.TestCase index 9455f6cd..65b2a8fd 100755 --- a/tests/scanner.TestCase +++ b/tests/scanner.TestCase @@ -45,17 +45,17 @@ class ScannerTest(unittest.TestCase): fdroidserver.scanner.options.json = False source_files = os.path.join(self.basedir, 'source-files') projects = { - 'cn.wildfirechat.chat': 4, - 'com.integreight.onesheeld': 11, + 'OtakuWorld': 2, 'Zillode': 1, + 'cn.wildfirechat.chat': 4, + 'com.github.shadowsocks': 6, + 'com.integreight.onesheeld': 11, + 'com.jens.automation2': 2, 'firebase-suspect': 1, 'org.mozilla.rocket': 3, + 'org.tasks': 3, 'realm': 1, 'se.manyver': 2, - 'com.jens.automation2': 2, - 'com.github.shadowsocks': 6, - 'org.tasks': 1, - 'OtakuWorld': 2, } for d in glob.glob(os.path.join(source_files, '*')): build = fdroidserver.metadata.Build()