Skip to content

Commit a765c09

Browse files
MGasztoldMGasztold
committed
migrate to androidx
1 parent a15c5f3 commit a765c09

29 files changed

+65
-64
lines changed

‎BasicExample/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ dependencies {
2222
implementation project(':org.eclipse.paho.android.service')
2323
// implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
2424
// implementation "org.eclipse.paho:org.eclipse.paho.android.service:${rootProject.ext.clientVersion}"
25-
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
26-
implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
27-
implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
25+
implementation 'androidx.appcompat:appcompat:1.0.0'
26+
implementation 'com.google.android.material:material:1.0.0'
27+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
2828

2929
testImplementation 'junit:junit:4.13'
3030
}

‎BasicExample/src/main/java/paho/mqtt/java/example/HistoryAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
package paho.mqtt.java.example;
1515

16-
import android.support.v7.widget.RecyclerView;
16+
import androidx.recyclerview.widget.RecyclerView;
1717
import android.view.LayoutInflater;
1818
import android.view.View;
1919
import android.view.ViewGroup;

‎BasicExample/src/main/java/paho/mqtt/java/example/PahoExampleActivity.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
package paho.mqtt.java.example;
1515

1616
import android.os.Bundle;
17-
import android.support.design.widget.FloatingActionButton;
18-
import android.support.design.widget.Snackbar;
19-
import android.support.v7.app.AppCompatActivity;
20-
import android.support.v7.widget.LinearLayoutManager;
21-
import android.support.v7.widget.RecyclerView;
22-
import android.support.v7.widget.Toolbar;
17+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
18+
import com.google.android.material.snackbar.Snackbar;
19+
import androidx.appcompat.app.AppCompatActivity;
20+
import androidx.recyclerview.widget.LinearLayoutManager;
21+
import androidx.recyclerview.widget.RecyclerView;
22+
import androidx.appcompat.widget.Toolbar;
2323
import android.view.Menu;
2424
import android.view.View;
2525

‎BasicExample/src/main/res/layout/activity_scrolling.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -8,40 +8,40 @@
88
tools:context=".PahoExampleActivity">
99

1010

11-
<android.support.design.widget.AppBarLayout
11+
<com.google.android.material.appbar.AppBarLayout
1212
android:id="@+id/app_bar"
1313
android:layout_width="match_parent"
1414
android:layout_height="@dimen/app_bar_height"
1515
android:theme="@style/AppTheme.AppBarOverlay">
1616

17-
<android.support.design.widget.CollapsingToolbarLayout
17+
<com.google.android.material.appbar.CollapsingToolbarLayout
1818
android:id="@+id/toolbar_layout"
1919
android:layout_width="match_parent"
2020
android:layout_height="match_parent"
2121
android:fitsSystemWindows="true"
2222
app:contentScrim="?attr/colorPrimary"
2323
app:layout_scrollFlags="scroll|exitUntilCollapsed">
2424

25-
<android.support.v7.widget.Toolbar
25+
<androidx.appcompat.widget.Toolbar
2626
android:id="@+id/toolbar"
2727
android:layout_width="match_parent"
2828
android:layout_height="?attr/actionBarSize"
2929
app:layout_collapseMode="pin"
3030
app:popupTheme="@style/AppTheme.PopupOverlay"/>
3131

32-
</android.support.design.widget.CollapsingToolbarLayout>
33-
</android.support.design.widget.AppBarLayout>
32+
</com.google.android.material.appbar.CollapsingToolbarLayout>
33+
</com.google.android.material.appbar.AppBarLayout>
3434

3535

36-
<android.support.v7.widget.RecyclerView
36+
<androidx.recyclerview.widget.RecyclerView
3737
android:id="@+id/history_recycler_view"
3838
android:layout_width="match_parent"
3939
android:layout_height="match_parent"
4040
android:fillViewport="true"
4141
app:layout_behavior="@string/appbar_scrolling_view_behavior"
4242
tools:context=".PahoExampleActivity"/>
4343

44-
<android.support.design.widget.FloatingActionButton
44+
<com.google.android.material.floatingactionbutton.FloatingActionButton
4545
android:id="@+id/fab"
4646
android:layout_width="wrap_content"
4747
android:layout_height="wrap_content"
@@ -55,4 +55,4 @@
5555
android:layout_height=".3dp"
5656
android:visibility="visible"/>
5757

58-
</android.support.design.widget.CoordinatorLayout>
58+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@
1111
# When configured, Gradle will run in incubating parallel mode.
1212
# This option should only be used with decoupled projects. More details, visit
1313
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
14-
# org.gradle.parallel=true
14+
# org.gradle.parallel=true
15+
android.enableJetifier=true
16+
android.useAndroidX=true

‎org.eclipse.paho.android.sample/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ dependencies {
2323
// implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
2424
// implementation "org.eclipse.paho:org.eclipse.paho.android.service:${rootProject.ext.clientVersion}"
2525

26-
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
27-
implementation "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
26+
implementation 'androidx.appcompat:appcompat:1.0.0'
27+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
2828
}
2929

3030
task publishAPK(type: Copy) {

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/ConnectionFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.eclipse.paho.android.sample.activity;
22

33
import android.os.Bundle;
4-
import android.support.v4.app.Fragment;
5-
import android.support.v4.app.FragmentTabHost;
4+
import androidx.fragment.app.Fragment;
5+
import androidx.fragment.app.FragmentTabHost;
66
import android.view.LayoutInflater;
77
import android.view.Menu;
88
import android.view.MenuInflater;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/EditConnectionFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.annotation.SuppressLint;
44
import android.os.Bundle;
5-
import android.support.v4.app.Fragment;
5+
import androidx.fragment.app.Fragment;
66
import android.text.Editable;
77
import android.text.TextWatcher;
88
import android.view.LayoutInflater;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/FragmentDrawer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import android.support.v4.app.Fragment;
6-
import android.support.v4.widget.DrawerLayout;
7-
import android.support.v7.app.ActionBarDrawerToggle;
8-
import android.support.v7.widget.LinearLayoutManager;
9-
import android.support.v7.widget.RecyclerView;
10-
import android.support.v7.widget.Toolbar;
5+
import androidx.fragment.app.Fragment;
6+
import androidx.drawerlayout.widget.DrawerLayout;
7+
import androidx.appcompat.app.ActionBarDrawerToggle;
8+
import androidx.recyclerview.widget.LinearLayoutManager;
9+
import androidx.recyclerview.widget.RecyclerView;
10+
import androidx.appcompat.widget.Toolbar;
1111
import android.view.GestureDetector;
1212
import android.view.LayoutInflater;
1313
import android.view.MotionEvent;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/HelpFragment.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package org.eclipse.paho.android.sample.activity;
22

33
import android.content.Intent;
4-
import android.content.SharedPreferences;
54
import android.content.pm.PackageInfo;
65
import android.content.pm.PackageManager;
76
import android.net.Uri;
87
import android.os.Build;
98
import android.os.Bundle;
10-
import android.preference.PreferenceManager;
11-
import android.support.v4.app.Fragment;
9+
10+
import androidx.fragment.app.Fragment;
1211
import android.util.Log;
1312
import android.view.LayoutInflater;
1413
import android.view.View;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/HistoryFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.eclipse.paho.android.sample.activity;
22

33
import android.os.Bundle;
4-
import android.support.v4.app.Fragment;
4+
import androidx.fragment.app.Fragment;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/HomeFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.eclipse.paho.android.sample.activity;
22

33
import android.os.Bundle;
4-
import android.support.v4.app.Fragment;
4+
import androidx.fragment.app.Fragment;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/MainActivity.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33

44
import android.os.Bundle;
5-
import android.support.v4.app.Fragment;
6-
import android.support.v4.app.FragmentManager;
7-
import android.support.v4.app.FragmentTransaction;
8-
import android.support.v4.widget.DrawerLayout;
9-
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.widget.Toolbar;
5+
import androidx.fragment.app.Fragment;
6+
import androidx.fragment.app.FragmentManager;
7+
import androidx.fragment.app.FragmentTransaction;
8+
import androidx.drawerlayout.widget.DrawerLayout;
9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.appcompat.widget.Toolbar;
1111
import android.util.Log;
1212
import android.view.Menu;
1313

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/ManageConnectionFragment.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
package org.eclipse.paho.android.sample.activity;
1717

1818
import android.os.Bundle;
19-
import android.support.v4.app.Fragment;
20-
import android.support.v4.app.FragmentManager;
21-
import android.support.v4.app.FragmentTransaction;
19+
import androidx.fragment.app.Fragment;
20+
import androidx.fragment.app.FragmentManager;
21+
import androidx.fragment.app.FragmentTransaction;
2222
import android.view.LayoutInflater;
2323
import android.view.View;
2424
import android.view.ViewGroup;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/MessagesFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.eclipse.paho.android.sample.activity;
22

33
import android.os.Bundle;
4-
import android.support.v4.app.Fragment;
4+
import androidx.fragment.app.Fragment;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/Notify.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import android.app.PendingIntent;
1818
import android.content.Context;
1919
import android.content.Intent;
20-
import android.support.v4.app.NotificationCompat.Builder;
20+
import androidx.core.app.NotificationCompat.Builder;
2121
import android.widget.Toast;
2222

2323
import org.eclipse.paho.android.sample.R;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/PublishFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.eclipse.paho.android.sample.activity;
22

33
import android.os.Bundle;
4-
import android.support.v4.app.Fragment;
4+
import androidx.fragment.app.Fragment;
55
import android.text.Editable;
66
import android.text.TextWatcher;
77
import android.view.LayoutInflater;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/activity/SubscriptionFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.content.Context;
55
import android.content.DialogInterface;
66
import android.os.Bundle;
7-
import android.support.v4.app.Fragment;
8-
import android.support.v7.app.AlertDialog;
7+
import androidx.fragment.app.Fragment;
8+
import androidx.appcompat.app.AlertDialog;
99
import android.view.LayoutInflater;
1010
import android.view.View;
1111
import android.view.ViewGroup;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/adapter/NavigationDrawerAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import android.content.Context;
55
import android.graphics.drawable.Drawable;
6-
import android.support.v4.content.ContextCompat;
7-
import android.support.v7.widget.RecyclerView;
6+
import androidx.core.content.ContextCompat;
7+
import androidx.recyclerview.widget.RecyclerView;
88
import android.view.LayoutInflater;
99
import android.view.View;
1010
import android.view.ViewGroup;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/components/MessageListItemAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.eclipse.paho.android.sample.components;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
4+
import androidx.annotation.NonNull;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/components/SubscriptionListItemAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.eclipse.paho.android.sample.components;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
4+
import androidx.annotation.NonNull;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎org.eclipse.paho.android.sample/src/main/java/org/eclipse/paho/android/sample/components/TextSelectComponent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import android.util.Log;
1111
import android.view.KeyEvent;
1212
import android.content.DialogInterface;
13-
import android.support.v7.app.AlertDialog;
13+
import androidx.appcompat.app.AlertDialog;
1414
import android.view.LayoutInflater;
1515
import android.view.View;
1616
import android.widget.EditText;

‎org.eclipse.paho.android.sample/src/main/res/layout/activity_main.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout"
1+
<androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout"
22
xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
@@ -41,4 +41,4 @@
4141
app:layout="@layout/fragment_navigation_drawer"
4242
tools:layout="@layout/fragment_navigation_drawer"/>
4343

44-
</android.support.v4.widget.DrawerLayout>
44+
</androidx.drawerlayout.widget.DrawerLayout>

‎org.eclipse.paho.android.sample/src/main/res/layout/fragment_connection.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
android:layout_height="match_parent"
55
android:orientation="vertical">
66

7-
<android.support.v4.app.FragmentTabHost
7+
<androidx.fragment.app.FragmentTabHost
88
android:id="@android:id/tabhost"
99
android:layout_width="match_parent"
1010
android:layout_height="wrap_content">
@@ -20,7 +20,7 @@
2020
android:layout_width="match_parent"
2121
android:layout_height="match_parent"
2222
/>
23-
</android.support.v4.app.FragmentTabHost>
23+
</androidx.fragment.app.FragmentTabHost>
2424

2525

2626
</LinearLayout>

‎org.eclipse.paho.android.sample/src/main/res/layout/fragment_navigation_drawer.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
android:layout_above="@+id/linearLayout"
3232
android:layout_below="@+id/nav_header_container">
3333

34-
<android.support.v7.widget.RecyclerView
34+
<androidx.recyclerview.widget.RecyclerView
3535
android:id="@+id/drawerList"
3636
android:layout_width="match_parent"
3737
android:layout_height="fill_parent"

‎org.eclipse.paho.android.sample/src/main/res/layout/toolbar.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.Toolbar android:id="@+id/toolbar"
2+
<androidx.appcompat.widget.Toolbar android:id="@+id/toolbar"
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:local="http://schemas.android.com/apk/res-auto"
55
android:layout_width="match_parent"

‎org.eclipse.paho.android.service/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222

2323
dependencies {
2424
api "org.eclipse.paho:org.eclipse.paho.client.mqttv3:${rootProject.ext.clientVersion}"
25-
implementation "com.android.support:support-v4:${rootProject.ext.supportLibVersion}"
25+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
2626
}
2727

2828
android.libraryVariants.all { variant ->

‎org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttAndroidClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import android.os.Build;
2727
import android.os.Bundle;
2828
import android.os.IBinder;
29-
import android.support.v4.content.LocalBroadcastManager;
29+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
3030
import android.util.SparseArray;
3131

3232
import org.eclipse.paho.client.mqttv3.DisconnectedBufferOptions;

‎org.eclipse.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import android.os.IBinder;
3030
import android.os.PowerManager;
3131
import android.os.PowerManager.WakeLock;
32-
import android.support.v4.content.LocalBroadcastManager;
32+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
3333

3434
import org.eclipse.paho.client.mqttv3.DisconnectedBufferOptions;
3535
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;

0 commit comments

Comments
 (0)