Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
Nickolay Savchenko committed Dec 29, 2018
1 parent bb315ed commit 2f0477b
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 128 deletions.
3 changes: 2 additions & 1 deletion example-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ android {
}

dependencies {
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'org.java-websocket:Java-WebSocket:1.3.6'
implementation 'com.android.support:recyclerview-v7:28.0.0'

Expand Down
2 changes: 2 additions & 0 deletions example-client/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
android.useAndroidX=true
android.enableJetifier=true
19 changes: 10 additions & 9 deletions example-client/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ua.naiksoftware.stompclientexample">
xmlns:tools="http://schemas.android.com/tools"
package="ua.naiksoftware.stompclientexample">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name="ua.naiksoftware.stompclientexample.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package ua.naiksoftware.stompclientexample;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import android.widget.Toast;
Expand All @@ -17,6 +14,9 @@
import java.util.List;
import java.util.Locale;

import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import io.reactivex.CompletableTransformer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
Expand Down Expand Up @@ -46,7 +46,7 @@ public class MainActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
mRecyclerView = (RecyclerView) findViewById(R.id.recycler_view);
mRecyclerView = findViewById(R.id.recycler_view);
mAdapter = new SimpleAdapter(mDataSet);
mAdapter.setHasStableIds(true);
mRecyclerView.setAdapter(mAdapter);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package ua.naiksoftware.stompclientexample;

import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import java.util.List;

import androidx.recyclerview.widget.RecyclerView;

/**
* Created by Naik on 24.02.17.
*/
Expand Down
2 changes: 1 addition & 1 deletion example-client/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

</LinearLayout>

<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 2f0477b

Please sign in to comment.