Skip to content

Commit 2f0477b

Browse files
author
Nickolay Savchenko
committed
Fix build
1 parent bb315ed commit 2f0477b

File tree

8 files changed

+21
-128
lines changed

8 files changed

+21
-128
lines changed

example-client/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation 'com.android.support:appcompat-v7:28.0.0'
48+
implementation 'androidx.appcompat:appcompat:1.0.2'
49+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
4950
implementation 'org.java-websocket:Java-WebSocket:1.3.6'
5051
implementation 'com.android.support:recyclerview-v7:28.0.0'
5152

example-client/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.useAndroidX=true
2+
android.enableJetifier=true

example-client/src/main/AndroidManifest.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="ua.naiksoftware.stompclientexample">
3+
xmlns:tools="http://schemas.android.com/tools"
4+
package="ua.naiksoftware.stompclientexample">
45

5-
<uses-permission android:name="android.permission.INTERNET"/>
6+
<uses-permission android:name="android.permission.INTERNET" />
67

78
<application
8-
android:allowBackup="true"
9-
android:icon="@mipmap/ic_launcher"
10-
android:label="@string/app_name"
11-
android:supportsRtl="true"
12-
android:theme="@style/AppTheme">
9+
android:allowBackup="true"
10+
android:icon="@mipmap/ic_launcher"
11+
android:label="@string/app_name"
12+
android:supportsRtl="true"
13+
android:theme="@style/AppTheme">
1314
<activity android:name="ua.naiksoftware.stompclientexample.MainActivity">
1415
<intent-filter>
15-
<action android:name="android.intent.action.MAIN"/>
16+
<action android:name="android.intent.action.MAIN" />
1617

17-
<category android:name="android.intent.category.LAUNCHER"/>
18+
<category android:name="android.intent.category.LAUNCHER" />
1819
</intent-filter>
1920
</activity>
2021
</application>

example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package ua.naiksoftware.stompclientexample;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
5-
import android.support.v7.widget.LinearLayoutManager;
6-
import android.support.v7.widget.RecyclerView;
74
import android.util.Log;
85
import android.view.View;
96
import android.widget.Toast;
@@ -17,6 +14,9 @@
1714
import java.util.List;
1815
import java.util.Locale;
1916

17+
import androidx.appcompat.app.AppCompatActivity;
18+
import androidx.recyclerview.widget.LinearLayoutManager;
19+
import androidx.recyclerview.widget.RecyclerView;
2020
import io.reactivex.CompletableTransformer;
2121
import io.reactivex.android.schedulers.AndroidSchedulers;
2222
import io.reactivex.disposables.CompositeDisposable;
@@ -46,7 +46,7 @@ public class MainActivity extends AppCompatActivity {
4646
protected void onCreate(Bundle savedInstanceState) {
4747
super.onCreate(savedInstanceState);
4848
setContentView(R.layout.activity_main);
49-
mRecyclerView = (RecyclerView) findViewById(R.id.recycler_view);
49+
mRecyclerView = findViewById(R.id.recycler_view);
5050
mAdapter = new SimpleAdapter(mDataSet);
5151
mAdapter.setHasStableIds(true);
5252
mRecyclerView.setAdapter(mAdapter);

example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package ua.naiksoftware.stompclientexample;
22

3-
import android.support.v7.widget.RecyclerView;
43
import android.view.LayoutInflater;
54
import android.view.View;
65
import android.view.ViewGroup;
76
import android.widget.TextView;
87

98
import java.util.List;
109

10+
import androidx.recyclerview.widget.RecyclerView;
11+
1112
/**
1213
* Created by Naik on 24.02.17.
1314
*/

example-client/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
</LinearLayout>
6464

65-
<android.support.v7.widget.RecyclerView
65+
<androidx.recyclerview.widget.RecyclerView
6666
android:id="@+id/recycler_view"
6767
android:layout_width="match_parent"
6868
android:layout_height="match_parent"

example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)