feat: migrate to androidx

demo-vue/package.json

@@ -7,6 +7,9 @@
     "id": "org.nativescript.demovuematerial",
     "tns-ios": {
       "version": "5.2.0"
+    },
+    "tns-android": {
+      "version": "5.3.0-2019-03-19-143503-02"
     }
   },
   "dependencies": {
@@ -22,7 +25,7 @@
     "nativescript-material-textfield": "../packages/nativescript-material-textfield",
     "nativescript-theme-core": "~1.0.4",
     "nativescript-vue": "~2.0.2",
-    "tns-core-modules": "^5.2.2",
+    "tns-core-modules": "5.4.0-androidx-2019-03-22-160602-06",
     "tslib": "^1.9.3",
     "vue-class-component": "^7.0.1"
   },
@@ -37,12 +40,12 @@
     "nativescript-dev-typescript": "~0.8.0",
     "nativescript-dev-webpack": "~0.20.2",
     "nativescript-vue-template-compiler": "~2.0.2",
-    "tns-platform-declarations": "^5.2.2",
     "shelljs": "^0.8.3",
+    "tns-platform-declarations": "5.4.0-androidx-2019-03-22-160602-06",
     "vue": "~2.5.17",
+    "vue-class-component": "~6.3.2",
     "vue-loader": "~15.7.0",
-    "vue-property-decorator": "~7.3.0",
-    "vue-class-component": "~6.3.2"
+    "vue-property-decorator": "~7.3.0"
   },
   "scripts": {
     "tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'"

demo/package.json

@@ -2,7 +2,7 @@
     "nativescript": {
         "id": "org.nativescript.demo",
         "tns-android": {
-            "version": "5.3.1"
+            "version": "5.3.0-2019-03-19-143503-02"
         }
     },
     "dependencies": {
@@ -20,7 +20,7 @@
         "nativescript-material-textfield": "file:../packages/nativescript-material-textfield",
         "nativescript-theme-core": "^1.0.4",
         "nativescript-ui-listview": "6.1.0",
-        "tns-core-modules": "^5.3.1"
+        "tns-core-modules": "5.4.0-androidx-2019-03-22-160602-06"
     },
     "devDependencies": {
         "awesome-typescript-loader": "~5.2.1",
@@ -37,7 +37,7 @@
         "node-sass": "^4.11.0",
         "resolve-url-loader": "~3.1.0",
         "sass-loader": "^7.1.0",
-        "tns-platform-declarations": "^5.3.1",
+        "tns-platform-declarations": "5.4.0-androidx-2019-03-22-160602-06",
         "ts-loader": "^5.3.3",
         "tslint": "~5.16.0",
         "typescript": "~3.4.3",

demo_ng/package.json

@@ -9,7 +9,7 @@
             "version": "4.2.0"
         },
         "tns-android": {
-            "version": "4.2.0"
+            "version": "5.3.0-2019-03-19-143503-02"
         }
     },
     "dependencies": {
@@ -22,12 +22,12 @@
         "@angular/platform-browser": "~7.1.2",
         "@angular/platform-browser-dynamic": "~7.1.2",
         "@angular/router": "~7.1.2",
-        "nativescript-material-components": "file:../plugin_nosource",
         "nativescript-angular": "~7.0.3",
+        "nativescript-material-components": "file:../plugin_nosource",
         "nativescript-theme-core": "~1.0.4",
-        "tns-core-modules": "5.0.5",
         "reflect-metadata": "~0.1.12",
         "rxjs": "~6.3.3",
+        "tns-core-modules": "5.4.0-androidx-2019-03-22-160602-06",
         "zone.js": "~0.8.26"
     },
     "devDependencies": {
@@ -38,7 +38,7 @@
         "babylon": "6.18.0",
         "lazy": "1.0.11",
         "nativescript-dev-typescript": "~0.7.2",
-        "tns-platform-declarations": "5.0.5",
+        "tns-platform-declarations": "5.4.0-androidx-2019-03-22-160602-06",
         "typescript": "~2.7.2"
     }
-}
+}

package.json

@@ -55,8 +55,8 @@
         "prompt": "^1.0.0",
         "rimraf": "^2.6.3",
         "rxjs": "^6.4.0",
-        "tns-core-modules": "5.3.1",
-        "tns-platform-declarations": "5.3.1",
+        "tns-core-modules": "5.4.0-androidx-2019-03-22-160602-06",
+        "tns-platform-declarations": "5.4.0-androidx-2019-03-22-160602-06",
         "tslint": "^5.14.0",
         "tslint-config-prettier": "^1.18.0",
         "tslint-config-standard": "^8.0.1",

packages/nativescript-material-activityindicator/platforms/android/before-plugins.gradle

@@ -1,4 +1,4 @@
-project.supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "28.0.0"
+project.androidxVersion = project.hasProperty("androidxVersion") ? project.androidxVersion : "1.0.0"
 project.buildToolsVersion = project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "28.0.3"
 project.compileSdk = project.hasProperty("compileSdk") ? project.compileSdk : 28
 project.targetSdk = project.hasProperty("targetSdk") ? project.targetSdk : 28

packages/nativescript-material-activityindicator/platforms/android/include.gradle

@@ -1,8 +1,15 @@
-dependencies {
-	def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
+def computeAndroidXVersion() {
+    if(project.hasProperty("androidxVersion")) {
+        return androidxVersion
+    }
+    else {
+        return "1.0.0"
     }
-	compile "com.android.support:appcompat-v7:$supportVer"
-	compile "com.android.support:design:$supportVer"
+}
+
+dependencies {
+	def androidxVersion = computeAndroidXVersion()
+
+	compile "androidx.appcompat:appcompat:$androidxVersion"
+	compile "com.google.android.material:material:1.0.0-rc01"
 }

packages/nativescript-material-bottomsheet/platforms/android/before-plugins.gradle

@@ -1,4 +1,4 @@
-project.supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "28.0.0"
+project.androidxVersion = project.hasProperty("androidxVersion") ? project.androidxVersion : "1.0.0"
 project.buildToolsVersion = project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "28.0.3"
 project.compileSdk = project.hasProperty("compileSdk") ? project.compileSdk : 28
 project.targetSdk = project.hasProperty("targetSdk") ? project.targetSdk : 28

packages/nativescript-material-bottomsheet/platforms/android/include.gradle

@@ -1,8 +1,15 @@
-dependencies {
-	def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
+def computeAndroidXVersion() {
+    if(project.hasProperty("androidxVersion")) {
+        return androidxVersion
+    }
+    else {
+        return "1.0.0"
     }
-	compile "com.android.support:appcompat-v7:$supportVer"
-	compile "com.android.support:design:$supportVer"
+}
+
+dependencies {
+	def androidxVersion = computeAndroidXVersion()
+
+	compile "androidx.appcompat:appcompat:$androidxVersion"
+	compile "com.google.android.material:material:1.0.0-rc01"
 }

packages/nativescript-material-button/platforms/android/before-plugins.gradle

@@ -1,4 +1,4 @@
-project.supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "28.0.0"
+project.androidxVersion = project.hasProperty("androidxVersion") ? project.androidxVersion : "1.0.0"
 project.buildToolsVersion = project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "28.0.3"
 project.compileSdk = project.hasProperty("compileSdk") ? project.compileSdk : 28
 project.targetSdk = project.hasProperty("targetSdk") ? project.targetSdk : 28

packages/nativescript-material-button/platforms/android/include.gradle

@@ -1,8 +1,15 @@
-dependencies {
-	def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
+def computeAndroidXVersion() {
+    if(project.hasProperty("androidxVersion")) {
+        return androidxVersion
+    }
+    else {
+        return "1.0.0"
     }
-	compile "com.android.support:appcompat-v7:$supportVer"
-	compile "com.android.support:design:$supportVer"
+}
+
+dependencies {
+	def androidxVersion = computeAndroidXVersion()
+
+	compile "androidx.appcompat:appcompat:$androidxVersion"
+	compile "com.google.android.material:material:1.0.0-rc01"
 }

packages/nativescript-material-button/platforms/android/res/layout/material_button.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
         style="@style/Button.Custom">
-</android.support.design.button.MaterialButton>
+</com.google.android.material.button.MaterialButton>

packages/nativescript-material-button/platforms/android/res/layout/material_button_flat.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
         style="@style/UnelevatedButton.Custom">
-</android.support.design.button.MaterialButton>
+</com.google.android.material.button.MaterialButton>

packages/nativescript-material-button/platforms/android/res/layout/material_button_text.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
         style="@style/TextButton.Custom">
-</android.support.design.button.MaterialButton>
+</com.google.android.material.button.MaterialButton>

packages/nativescript-material-cardview/platforms/android/before-plugins.gradle

@@ -1,4 +1,4 @@
-project.supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "28.0.0"
+project.androidxVersion = project.hasProperty("androidxVersion") ? project.androidxVersion : "1.0.0"
 project.buildToolsVersion = project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "28.0.3"
 project.compileSdk = project.hasProperty("compileSdk") ? project.compileSdk : 28
 project.targetSdk = project.hasProperty("targetSdk") ? project.targetSdk : 28

packages/nativescript-material-cardview/platforms/android/include.gradle

@@ -1,8 +1,15 @@
-dependencies {
-	def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
+def computeAndroidXVersion() {
+    if(project.hasProperty("androidxVersion")) {
+        return androidxVersion
+    }
+    else {
+        return "1.0.0"
     }
-	compile "com.android.support:appcompat-v7:$supportVer"
-	compile "com.android.support:design:$supportVer"
+}
+
+dependencies {
+	def androidxVersion = computeAndroidXVersion()
+
+	compile "androidx.appcompat:appcompat:$androidxVersion"
+	compile "com.google.android.material:material:1.0.0-rc01"
 }

packages/nativescript-material-core/platforms/android/before-plugins.gradle

@@ -1,4 +1,4 @@
-project.supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "28.0.0"
+project.androidxVersion = project.hasProperty("androidxVersion") ? project.androidxVersion : "1.0.0"
 project.buildToolsVersion = project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "28.0.3"
 project.compileSdk = project.hasProperty("compileSdk") ? project.compileSdk : 28
 project.targetSdk = project.hasProperty("targetSdk") ? project.targetSdk : 28

packages/nativescript-material-core/platforms/android/include.gradle

@@ -1,8 +1,15 @@
-dependencies {
-	def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
+def computeAndroidXVersion() {
+    if(project.hasProperty("androidxVersion")) {
+        return androidxVersion
+    }
+    else {
+        return "1.0.0"
     }
-	compile "com.android.support:appcompat-v7:$supportVer"
-	compile "com.android.support:design:$supportVer"
+}
+
+dependencies {
+	def androidxVersion = computeAndroidXVersion()
+
+	compile "androidx.appcompat:appcompat:$androidxVersion"
+	compile "com.google.android.material:material:1.0.0-rc01"
 }

packages/nativescript-material-core/platforms/android/res/layout/material_page.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true">
 
 
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -28,6 +28,6 @@
             android:orientation="vertical">
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

packages/nativescript-material-dialogs/platforms/android/before-plugins.gradle

@@ -1,4 +1,4 @@
-project.supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "28.0.0"
+project.androidxVersion = project.hasProperty("androidxVersion") ? project.androidxVersion : "1.0.0"
 project.buildToolsVersion = project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "28.0.3"
 project.compileSdk = project.hasProperty("compileSdk") ? project.compileSdk : 28
 project.targetSdk = project.hasProperty("targetSdk") ? project.targetSdk : 28

packages/nativescript-material-dialogs/platforms/android/include.gradle

@@ -1,8 +1,15 @@
-dependencies {
-	def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
+def computeAndroidXVersion() {
+    if(project.hasProperty("androidxVersion")) {
+        return androidxVersion
+    }
+    else {
+        return "1.0.0"
     }
-	compile "com.android.support:appcompat-v7:$supportVer"
-	compile "com.android.support:design:$supportVer"
+}
+
+dependencies {
+	def androidxVersion = computeAndroidXVersion()
+
+	compile "androidx.appcompat:appcompat:$androidxVersion"
+	compile "com.google.android.material:material:1.0.0-rc01"
 }

packages/nativescript-material-floatingactionbutton/platforms/android/before-plugins.gradle

@@ -1,4 +1,4 @@
-project.supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "28.0.0"
+project.androidxVersion = project.hasProperty("androidxVersion") ? project.androidxVersion : "1.0.0"
 project.buildToolsVersion = project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "28.0.3"
 project.compileSdk = project.hasProperty("compileSdk") ? project.compileSdk : 28
 project.targetSdk = project.hasProperty("targetSdk") ? project.targetSdk : 28

packages/nativescript-material-floatingactionbutton/platforms/android/include.gradle

@@ -1,8 +1,15 @@
-dependencies {
-	def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
+def computeAndroidXVersion() {
+    if(project.hasProperty("androidxVersion")) {
+        return androidxVersion
+    }
+    else {
+        return "1.0.0"
     }
-	compile "com.android.support:appcompat-v7:$supportVer"
-	compile "com.android.support:design:$supportVer"
+}
+
+dependencies {
+	def androidxVersion = computeAndroidXVersion()
+
+	compile "androidx.appcompat:appcompat:$androidxVersion"
+	compile "com.google.android.material:material:1.0.0-rc01"
 }

packages/nativescript-material-progress/platforms/android/before-plugins.gradle

@@ -1,4 +1,4 @@
-project.supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "28.0.0"
+project.androidxVersion = project.hasProperty("androidxVersion") ? project.androidxVersion : "1.0.0"
 project.buildToolsVersion = project.hasProperty("buildToolsVersion") ? project.buildToolsVersion : "28.0.3"
 project.compileSdk = project.hasProperty("compileSdk") ? project.compileSdk : 28
 project.targetSdk = project.hasProperty("targetSdk") ? project.targetSdk : 28