Merge pull request #2385 from RobertFlatt/enable_androidx

Enable AndroidX

Author: inclement

doc/source/buildoptions.rst

@@ -92,6 +92,7 @@ options (this list may not be exhaustive):
   run. See :ref:`arbitrary_scripts_services`.
 - ``--add-source``: Add a source directory to the app's Java code.
 - ``--no-compile-pyo``: Do not optimise .py files to .pyo.
+- ``--enable-androidx``: Enable AndroidX support library.
 
 
 webview

pythonforandroid/bootstraps/common/build/build.py

@@ -343,6 +343,9 @@ def make_package(args):
         join(res_dir, 'drawable/icon.png')
     )
 
+    if args.enable_androidx:
+        shutil.copy('templates/gradle.properties', 'gradle.properties')
+
     if get_bootstrap_name() != "service_only":
         lottie_splashscreen = join(res_dir, 'raw/splashscreen.json')
         if args.presplash_lottie:
@@ -706,6 +709,10 @@ def parse_args_and_make_package(args=None):
                               'topics/manifest/'
                               'activity-element.html'))
 
+    ap.add_argument('--enable-androidx', dest='enable_androidx',
+                    action='store_true',
+                    help=('Enable the AndroidX support library, '
+                          'requires api = 28 or greater'))
     ap.add_argument('--android-entrypoint', dest='android_entrypoint',
                     default=DEFAULT_PYTHON_ACTIVITY_JAVA_CLASS,
                     help='Defines which java class will be used for startup, usually a subclass of PythonActivity')

pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle

@@ -76,8 +76,13 @@ android {
     }
 
     compileOptions {
+    	{% if args.enable_androidx %}
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+	{% else %}
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
+	{% endif %}
         {%- for option in args.compile_options %}
         {{option}}
         {%- endfor %}

pythonforandroid/bootstraps/common/build/templates/gradle.properties

@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true