fix: upgrade dependencies and fix security vulnerabilities across all MQTT client examples

mqtt-client-Android-Kotlin/app/build.gradle

@@ -4,12 +4,13 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    namespace 'io.emqx.mqtt'
+    compileSdk 34
 
     defaultConfig {
         applicationId "io.emqx.mqtt"
         minSdk 21
-        targetSdk 32
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -29,19 +30,31 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/ASL2.0'
+        exclude 'META-INF/*.kotlin_module'
+        exclude 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
+    }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.59'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.80'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
 }

mqtt-client-Android-Kotlin/build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.2' apply false
-    id 'com.android.library' version '7.2.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+    id 'com.android.application' version '8.1.4' apply false
+    id 'com.android.library' version '8.1.4' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }
 
 task clean(type: Delete) {

mqtt-client-Android-Kotlin/gradle.properties

@@ -21,4 +21,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.enableJetifier=true
+android.enableJetifier=false

mqtt-client-Android-Kotlin/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Aug 15 09:48:05 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

mqtt-client-Android/app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "30.0.0"
+    namespace 'io.emqx.mqtt'
+    compileSdkVersion 34
+    buildToolsVersion "34.0.0"
 
     defaultConfig {
         applicationId "io.emqx.mqtt"
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -20,21 +21,33 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/ASL2.0'
+        exclude 'META-INF/*.kotlin_module'
+        exclude 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
+    }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.59'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.80'
 
 }

mqtt-client-Android/app/src/main/java/io/emqx/mqtt/PublishFragment.java

@@ -78,27 +78,19 @@ private Publish getPublish() {
         String message = mPayload.getText().toString();
         int qos = 0;
         int qosCheckedId = mQosRadioGroup.getCheckedRadioButtonId();
-        switch (qosCheckedId) {
-            case R.id.qos0:
-                qos = 0;
-                break;
-            case R.id.qos1:
-                qos = 1;
-                break;
-            case R.id.qos2:
-                qos = 2;
-                break;
+        if (qosCheckedId == R.id.qos0) {
+            qos = 0;
+        } else if (qosCheckedId == R.id.qos1) {
+            qos = 1;
+        } else if (qosCheckedId == R.id.qos2) {
+            qos = 2;
         }
         boolean retained = false;
         int retainedCheckedId = mRetainedRadioGroup.getCheckedRadioButtonId();
-        switch (retainedCheckedId) {
-            case R.id.retained_true:
-                retained = true;
-                break;
-            case R.id.retained_false:
-                retained = false;
-                break;
-
+        if (retainedCheckedId == R.id.retained_true) {
+            retained = true;
+        } else if (retainedCheckedId == R.id.retained_false) {
+            retained = false;
         }
 
         return new Publish(topic, message, qos, retained);

mqtt-client-Android/app/src/main/java/io/emqx/mqtt/SubscriptionFragment.java

@@ -73,16 +73,12 @@ private Subscription getSubscription() {
         String topic = mTopic.getText().toString();
         int qos = 0;
         int qosCheckedId = mRadioGroup.getCheckedRadioButtonId();
-        switch (qosCheckedId) {
-            case R.id.qos0:
-                qos = 0;
-                break;
-            case R.id.qos1:
-                qos = 1;
-                break;
-            case R.id.qos2:
-                qos = 2;
-                break;
+        if (qosCheckedId == R.id.qos0) {
+            qos = 0;
+        } else if (qosCheckedId == R.id.qos1) {
+            qos = 1;
+        } else if (qosCheckedId == R.id.qos2) {
+            qos = 2;
         }
 
 

mqtt-client-Android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:8.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

mqtt-client-Android/gradle.properties

@@ -16,4 +16,4 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false

mqtt-client-Android/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-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip