eclipse-paho · MGasztold · Jul 6, 2020 · Jul 6, 2020 · Jul 7, 2020 · Jul 16, 2020
diff --git a/BasicExample/build.gradle b/BasicExample/build.gradle
@@ -22,9 +22,9 @@ dependencies {
     implementation project(':org.eclipse.paho.android.service')
 //    implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
 //    implementation "org.eclipse.paho:org.eclipse.paho.android.service:${rootProject.ext.clientVersion}"
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
-    implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 
     testImplementation 'junit:junit:4.13'
 }
diff --git a/BasicExample/src/main/java/paho/mqtt/java/example/HistoryAdapter.java b/BasicExample/src/main/java/paho/mqtt/java/example/HistoryAdapter.java
@@ -13,7 +13,7 @@
  */
 package paho.mqtt.java.example;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/BasicExample/src/main/java/paho/mqtt/java/example/PahoExampleActivity.java b/BasicExample/src/main/java/paho/mqtt/java/example/PahoExampleActivity.java
@@ -14,12 +14,12 @@
 package paho.mqtt.java.example;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.View;
 

diff --git a/BasicExample/src/main/res/layout/activity_scrolling.xml b/BasicExample/src/main/res/layout/activity_scrolling.xml
@@ -1,5 +1,5 @@
 <?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"
                                                  xmlns:tools="http://schemas.android.com/tools"
                                                  android:layout_width="match_parent"
@@ -8,40 +8,40 @@
                                                  tools:context=".PahoExampleActivity">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/app_bar_height"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/toolbar_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fitsSystemWindows="true"
             app:contentScrim="?attr/colorPrimary"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/history_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:context=".PahoExampleActivity"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -55,4 +55,4 @@
         android:layout_height=".3dp"
         android:visibility="visible"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/gradle.properties b/gradle.properties
@@ -11,4 +11,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/org.eclipse.paho.android.sample/build.gradle b/org.eclipse.paho.android.sample/build.gradle
@@ -23,8 +23,8 @@ dependencies {
 //    implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
 //    implementation "org.eclipse.paho:org.eclipse.paho.android.service:${rootProject.ext.clientVersion}"
 
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }
 
 task publishAPK(type: Copy) {

diff --git a/...oid.sample/src/main/java/org/eclipse/paho/android/sample/activity/ConnectionFragment.java b/...oid.sample/src/main/java/org/eclipse/paho/android/sample/activity/ConnectionFragment.java
@@ -1,8 +1,8 @@
 package org.eclipse.paho.android.sample.activity;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTabHost;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTabHost;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/...sample/src/main/java/org/eclipse/paho/android/sample/activity/EditConnectionFragment.java b/...sample/src/main/java/org/eclipse/paho/android/sample/activity/EditConnectionFragment.java
@@ -2,7 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

diff --git a/...android.sample/src/main/java/org/eclipse/paho/android/sample/activity/FragmentDrawer.java b/...android.sample/src/main/java/org/eclipse/paho/android/sample/activity/FragmentDrawer.java
@@ -2,12 +2,12 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;

diff --git a/...o.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/HelpFragment.java b/...o.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/HelpFragment.java
@@ -1,14 +1,13 @@
 package org.eclipse.paho.android.sample.activity;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/...ndroid.sample/src/main/java/org/eclipse/paho/android/sample/activity/HistoryFragment.java b/...ndroid.sample/src/main/java/org/eclipse/paho/android/sample/activity/HistoryFragment.java
@@ -1,7 +1,7 @@
 package org.eclipse.paho.android.sample.activity;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...o.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/HomeFragment.java b/...o.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/HomeFragment.java
@@ -1,7 +1,7 @@
 package org.eclipse.paho.android.sample.activity;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...o.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/MainActivity.java b/...o.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/MainActivity.java
@@ -2,12 +2,12 @@
 
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 

diff --git a/...mple/src/main/java/org/eclipse/paho/android/sample/activity/ManageConnectionFragment.java b/...mple/src/main/java/org/eclipse/paho/android/sample/activity/ManageConnectionFragment.java
@@ -16,9 +16,9 @@
 package org.eclipse.paho.android.sample.activity;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...droid.sample/src/main/java/org/eclipse/paho/android/sample/activity/MessagesFragment.java b/...droid.sample/src/main/java/org/eclipse/paho/android/sample/activity/MessagesFragment.java
@@ -1,7 +1,7 @@
 package org.eclipse.paho.android.sample.activity;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...se.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/Notify.java b/...se.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/Notify.java
@@ -17,7 +17,7 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat.Builder;
 import android.widget.Toast;
 
 import org.eclipse.paho.android.sample.R;

diff --git a/...ndroid.sample/src/main/java/org/eclipse/paho/android/sample/activity/PublishFragment.java b/...ndroid.sample/src/main/java/org/eclipse/paho/android/sample/activity/PublishFragment.java
@@ -1,7 +1,7 @@
 package org.eclipse.paho.android.sample.activity;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

diff --git a/...d.sample/src/main/java/org/eclipse/paho/android/sample/activity/SubscriptionFragment.java b/...d.sample/src/main/java/org/eclipse/paho/android/sample/activity/SubscriptionFragment.java
@@ -4,8 +4,8 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...sample/src/main/java/org/eclipse/paho/android/sample/adapter/NavigationDrawerAdapter.java b/...sample/src/main/java/org/eclipse/paho/android/sample/adapter/NavigationDrawerAdapter.java
@@ -3,8 +3,8 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...mple/src/main/java/org/eclipse/paho/android/sample/components/MessageListItemAdapter.java b/...mple/src/main/java/org/eclipse/paho/android/sample/components/MessageListItemAdapter.java
@@ -1,7 +1,7 @@
 package org.eclipse.paho.android.sample.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...src/main/java/org/eclipse/paho/android/sample/components/SubscriptionListItemAdapter.java b/...src/main/java/org/eclipse/paho/android/sample/components/SubscriptionListItemAdapter.java
@@ -1,7 +1,7 @@
 package org.eclipse.paho.android.sample.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/....sample/src/main/java/org/eclipse/paho/android/sample/components/TextSelectComponent.java b/....sample/src/main/java/org/eclipse/paho/android/sample/components/TextSelectComponent.java
@@ -10,7 +10,7 @@
 import android.util.Log;
 import android.view.KeyEvent;
 import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;

diff --git a/org.eclipse.paho.android.sample/src/main/res/layout/activity_main.xml b/org.eclipse.paho.android.sample/src/main/res/layout/activity_main.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout"
+<androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout"
                                         xmlns:android="http://schemas.android.com/apk/res/android"
                                         xmlns:app="http://schemas.android.com/apk/res-auto"
                                         xmlns:tools="http://schemas.android.com/tools"
@@ -41,4 +41,4 @@
         app:layout="@layout/fragment_navigation_drawer"
         tools:layout="@layout/fragment_navigation_drawer"/>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/org.eclipse.paho.android.sample/src/main/res/layout/fragment_connection.xml b/org.eclipse.paho.android.sample/src/main/res/layout/fragment_connection.xml
@@ -4,7 +4,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.v4.app.FragmentTabHost
+    <androidx.fragment.app.FragmentTabHost
         android:id="@android:id/tabhost"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             />
-    </android.support.v4.app.FragmentTabHost>
+    </androidx.fragment.app.FragmentTabHost>
 
 
 </LinearLayout>
diff --git a/org.eclipse.paho.android.sample/src/main/res/layout/fragment_navigation_drawer.xml b/org.eclipse.paho.android.sample/src/main/res/layout/fragment_navigation_drawer.xml
@@ -31,7 +31,7 @@
         android:layout_above="@+id/linearLayout"
         android:layout_below="@+id/nav_header_container">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/drawerList"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"

diff --git a/org.eclipse.paho.android.sample/src/main/res/layout/toolbar.xml b/org.eclipse.paho.android.sample/src/main/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar android:id="@+id/toolbar"
+<androidx.appcompat.widget.Toolbar android:id="@+id/toolbar"
                                    xmlns:android="http://schemas.android.com/apk/res/android"
                                    xmlns:local="http://schemas.android.com/apk/res-auto"
                                    android:layout_width="match_parent"

diff --git a/org.eclipse.paho.android.service/build.gradle b/org.eclipse.paho.android.service/build.gradle
@@ -22,7 +22,7 @@ android {
 
 dependencies {
     api "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
-    implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
 
 android.libraryVariants.all { variant ->