upgraded gradle and android SDK version for lib, example-client and t…

.gitignore

@@ -6,3 +6,4 @@
 /build
 /captures
 test-server/build
+.idea/

example-client/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 
@@ -20,18 +20,18 @@ repositories {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
     //buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "ua.naiksoftware.stompclientexample"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
     buildTypes {
-        release {
+        debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -41,14 +41,15 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'ua.naiksoftware.stompclientexample'
 }
 
 dependencies {
     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.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     // RxJava
     implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'

example-client/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="ua.naiksoftware.stompclientexample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -12,10 +10,10 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
-        <activity android:name="ua.naiksoftware.stompclientexample.MainActivity">
+        <activity android:name="ua.naiksoftware.stompclientexample.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

gradle.properties

@@ -15,4 +15,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

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

lib/build.gradle

@@ -7,9 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 
@@ -19,19 +17,15 @@ repositories {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'groovyx.android'
 
 group='com.github.NaikSoftware'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 33
     }
 
     compileOptions {
@@ -49,6 +43,7 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+    namespace 'ua.naiksoftware.stomp'
 }
 
 
@@ -57,7 +52,7 @@ dependencies {
     // Supported transports
     api 'org.java-websocket:Java-WebSocket:1.3.6'
     api 'com.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.0.0'
     testImplementation 'com.andrewreitz:spock-android:2.0.0'
     testImplementation 'org.testcontainers:testcontainers:1.10.5'
     testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'

lib/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest package="ua.naiksoftware.stomp">
+<manifest>
 
     <application />
 

lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java

@@ -1,8 +1,9 @@
 package ua.naiksoftware.stomp;
 
-import android.support.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Scheduler;

lib/src/main/java/ua/naiksoftware/stomp/Stomp.java

@@ -1,7 +1,7 @@
 package ua.naiksoftware.stomp;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Map;
 

lib/src/main/java/ua/naiksoftware/stomp/StompClient.java

@@ -1,10 +1,11 @@
 package ua.naiksoftware.stomp;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java

@@ -1,7 +1,7 @@
 package ua.naiksoftware.stomp.dto;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.io.StringReader;
 import java.util.ArrayList;

lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java

@@ -1,9 +1,10 @@
 package ua.naiksoftware.stomp.provider;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Completable;

lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java

@@ -1,9 +1,10 @@
 package ua.naiksoftware.stomp.provider;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;

lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java

@@ -1,9 +1,10 @@
 package ua.naiksoftware.stomp.provider;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.java_websocket.WebSocket;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft_6455;