android X support only

Author: vtrifonov

build-artifacts/project-template-gradle/app/src/main/java/com/tns/NativeScriptApplication.java

@@ -2,7 +2,7 @@
 
 import android.app.Application;
 import android.os.Build;
-import android.support.multidex.MultiDex;
+import androidx.multidex.MultiDex;
 
 public class NativeScriptApplication extends Application {
 

build-artifacts/project-template-gradle/gradle.properties

@@ -15,3 +15,6 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx16384M
+
+android.enableJetifier=true
+android.useAndroidX=true

test-app/app/build.gradle

@@ -12,8 +12,10 @@
 *
 *            -PtargetSdk=[target_sdk]
 *            -PbuildToolsVersion=[build_tools_version]
-*            -PsupportVersion=[support_version]
 *            -PcompileSdk=[compile_sdk_version]
+*            -PandroidXLegacy=[androidx_legacy_version]
+*            -PandroidXAppCompat=[androidx_appcompat_version]
+*            -PandroidXMaterial=[androidx_material_version]
 */
 
 import groovy.json.JsonSlurper
@@ -304,40 +306,27 @@ repositories {
 }
 
 dependencies {
-    def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
+    def androidXLegacyVersion = "1.0.0"
+    if (project.hasProperty("androidXLegacy")) {
+        androidXLegacyVersion = androidXLegacy
     }
-    if (project.hasProperty("useAndroidX") && (useAndroidX || useAndroidX.toBoolean())) {
-        def androidXLegacyVersion = "1.0.0"
-        if (project.hasProperty("androidXLegacy")) {
-            androidXLegacyVersion = androidXLegacy
-        }
-
-        def androidXAppCompatVersion = "1.1.0-alpha01"
-        if (project.hasProperty("androidXAppCompat")) {
-            androidXAppCompatVersion = androidXAppCompat
-        }
 
-        def androidXMaterialVersion = "1.1.0-alpha01"
-        if (project.hasProperty("androidXMaterial")) {
-            androidXMaterialVersion = androidXMaterial
-        }
+    def androidXAppCompatVersion = "1.1.0-alpha01"
+    if (project.hasProperty("androidXAppCompat")) {
+        androidXAppCompatVersion = androidXAppCompat
+    }
 
-        println "\t + using andorid X library androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
+    def androidXMaterialVersion = "1.1.0-alpha01"
+    if (project.hasProperty("androidXMaterial")) {
+        androidXMaterialVersion = androidXMaterial
+    }
 
-        implementation "androidx.multidex:multidex:2.0.0"
-        implementation "androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
-        implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
-        implementation "com.google.android.material:material:$androidXMaterialVersion"
-    } else {
-        println "\t + using support library version $supportVer"
+    println "\t + using andorid X library androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
 
-        implementation "com.android.support:multidex:1.0.2"
-        implementation "com.android.support:support-v4:$supportVer"
-        implementation "com.android.support:appcompat-v7:$supportVer"
-        implementation "com.android.support:design:$supportVer"
-    }
+    implementation "androidx.multidex:multidex:2.0.0"
+    implementation "androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
+    implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
+    implementation "com.google.android.material:material:$androidXMaterialVersion"
 
     def useV8Symbols = false
 
@@ -429,7 +418,6 @@ tasks.whenTaskAdded({ org.gradle.api.DefaultTask currentTask ->
         extractAllJars.finalizedBy(collectAllJars)
     }
     if (currentTask =~ /compile.+JavaWithJavac/) {
-        currentTask.dependsOn(makeAndroidXChanges)
         currentTask.dependsOn(runSbg)
         currentTask.finalizedBy(ensureMetadataOutDir)
         ensureMetadataOutDir.finalizedBy(buildMetadata)
@@ -691,43 +679,6 @@ task buildMetadata(type: JavaExec) {
     }
 }
 
-task makeAndroidXChanges {
-    if (project.hasProperty("useAndroidX") && (useAndroidX || useAndroidX.toBoolean())) {
-        // code changes
-        def codeTuples = new ArrayList<Tuple2<String, String>>()
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.annotation\\.NonNull', 'androidx.annotation.NonNull'))
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.v7\\.app\\.AppCompatActivity', 'androidx.appcompat.app.AppCompatActivity'))
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.v7\\.appcompat\\.R', 'androidx.appcompat.R'))
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.design\\.widget\\.TabLayout', 'com.google.android.material.tabs.TabLayout'))
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.v4\\.app\\.ActivityCompat', 'androidx.core.app.ActivityCompat'))
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.v4\\.app\\.Fragment', 'androidx.fragment.app.Fragment'))
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.v4\\.view\\.ViewPager', 'androidx.viewpager.widget.ViewPager'))
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.v7\\.widget\\.Toolbar', 'androidx.appcompat.widget.Toolbar'))
-        codeTuples.add(new Tuple2<String, String>('android\\.support\\.multidex\\.MultiDex', 'androidx.multidex.MultiDex'))
-
-        codeTuples.each { tuple ->
-            ant.replaceregexp(match: tuple.first, replace: tuple.second, flags: 'g', byline: true) {
-                fileset(dir: "$projectDir/src/debug/java/com/tns/", includes: '*.java')
-            }
-            ant.replaceregexp(match: tuple.first, replace: tuple.second, flags: 'g', byline: true) {
-                fileset(dir: "$projectDir/src/main/java/com/tns/", includes: '*.java')
-            }
-        }
-
-        // resource changes
-        def resourceTuples = new ArrayList<Tuple2<String, String>>()
-        resourceTuples.add(new Tuple2<String, String>('android\\.support\\.v7\\.widget\\.Toolbar', 'androidx.appcompat.widget.Toolbar'))
-        resourceTuples.add(new Tuple2<String, String>('android\\.support\\.v4\\.view\\.ViewPager', 'androidx.viewpager.widget.ViewPager'))
-        resourceTuples.add(new Tuple2<String, String>('android\\.support\\.design\\.widget\\.TabLayout', 'com.google.android.material.tabs.TabLayout'))
-
-        resourceTuples.each { tuple ->
-            ant.replaceregexp(match: tuple.first, replace: tuple.second, flags: 'g', byline: true) {
-                fileset(dir: "$projectDir/src/debug/res/layout/", includes: 'error_activity.xml')
-            }
-        }
-    }
-}
-
 task generateTypescriptDefinitions(type: JavaExec) {
     if (!findProject(':dts-generator').is(null)) {
         dependsOn ':dts-generator:jar'

test-app/app/src/debug/java/com/tns/ErrorReport.java

@@ -25,14 +25,14 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.tabs.TabLayout;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
 import android.view.LayoutInflater;

test-app/app/src/debug/java/com/tns/ErrorReportActivity.java

@@ -2,8 +2,8 @@
 
 import android.app.Application;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import java.lang.reflect.Method;
@@ -13,7 +13,7 @@
 
 public class ErrorReportActivity extends AppCompatActivity {
     public void onCreate(Bundle savedInstanceState) {
-        setTheme(android.support.v7.appcompat.R.style.Theme_AppCompat_NoActionBar);
+        setTheme(androidx.appcompat.R.style.Theme_AppCompat_NoActionBar);
 
         super.onCreate(savedInstanceState);
         Application app = this.getApplication();

test-app/app/src/debug/res/layout/error_activity.xml

@@ -7,22 +7,22 @@
                 tools:context="com.tns.ErrorReportActivity"
                 android:theme="@style/Widget.AppCompat.Light.ActionBar">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"/>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
         android:layout_below="@+id/toolbar"
         android:scrollbarAlwaysDrawVerticalTrack="false">
 
-    </android.support.v4.view.ViewPager>
+    </androidx.viewpager.widget.ViewPager>
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

test-app/build-tools/jsparser/package-lock.json

@@ -1,7 +1,7 @@
 import { setActivityCallbacks, AndroidActivityCallbacks } from "ui/frame";
 
 @JavaProxy("org.nativescript.a.MyCustomActivity")
-class Activity extends android.support.v7.app.AppCompatActivity {
+class Activity extends androidx.appcompat.app.AppCompatActivity {
     private _callbacks: AndroidActivityCallbacks;
 
     protected onCreate(savedInstanceState: android.os.Bundle): void {