Update android.yml

gojek · Nov 4, 2024 · bc7df6e · bc7df6e
1 parent 09d9fbf
commit bc7df6e
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 83 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -60,9 +60,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '18.x'
       - name: Check Build Website
         run: |
           cd docs

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -9,10 +9,11 @@ jobs:
     name: Publish GitHub Pages
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: '16.x'
+
       - name: Build website
         run: |
           cd docs

diff --git a/app/src/main/java/com/gojek/courier/app/ui/MainActivity.kt b/app/src/main/java/com/gojek/courier/app/ui/MainActivity.kt
@@ -29,7 +29,6 @@ import com.gojek.mqtt.model.AdaptiveKeepAliveConfig
 import com.gojek.mqtt.model.KeepAlive
 import com.gojek.mqtt.model.MqttConnectOptions
 import com.gojek.mqtt.model.ServerUri
-import com.gojek.mqtt.model.Will
 import com.gojek.workmanager.pingsender.WorkManagerPingSenderConfig
 import com.gojek.workmanager.pingsender.WorkPingSenderFactory
 import kotlinx.android.synthetic.main.activity_main.brokerIP
@@ -123,21 +122,12 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun connectMqtt(clientId: String, username: String, password: String, ip: String, port: Int) {
-
-        val will = Will(
-            topic = "last/will/topic",
-            message = "Client disconnected unexpectedly",
-            qos = QoS.ZERO,
-            retained = false
-        )
-
         val connectOptions = MqttConnectOptions.Builder()
             .serverUris(listOf(ServerUri(ip, port, if (port == 443) "ssl" else "tcp")))
             .clientId(clientId)
             .userName(username)
             .password(password)
             .cleanSession(false)
-            .will(will)
             .keepAlive(KeepAlive(timeSeconds = 30))
             .build()
 

diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt
@@ -7,7 +7,7 @@ object versions {
     const val kotlin = "1.6.21"
     const val agp = "7.4.2"
     const val jetifierProcessor = "1.0.0-beta10"
-    const val jfrogBuildInfoExtractor = "4.23.4"
+    const val jfrogBuildInfoExtractor = "4.11.0"
     const val navigation = "2.1.0-rc01"
     const val coroutines = "1.3.2"
     const val broadcast = "1.0.0"

diff --git a/docs/package.json b/docs/package.json
@@ -1,10 +1,7 @@
 {
   "name": "docs",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
-  "engines": {
-    "node": ">=18"
-  },
   "scripts": {
     "docusaurus": "docusaurus",
     "start": "docusaurus start",
@@ -17,16 +14,16 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "^3.0.0",
-    "@docusaurus/preset-classic": "^3.0.0",
-    "@mdx-js/react": "^3.0.0",
-    "clsx": "^2.0.0",
-    "prism-react-renderer": "^2.0.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "@docusaurus/core": "2.0.0-beta.20",
+    "@docusaurus/preset-classic": "2.0.0-beta.20",
+    "@mdx-js/react": "^1.6.22",
+    "clsx": "^1.1.1",
+    "prism-react-renderer": "^1.3.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^3.0.0"
+    "@docusaurus/module-type-aliases": "2.0.0-beta.20"
   },
   "browserslist": {
     "production": [
@@ -40,4 +37,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
diff --git a/mqtt-client/api/mqtt-client.api b/mqtt-client/api/mqtt-client.api
@@ -1054,7 +1054,6 @@ public final class com/gojek/mqtt/model/MqttConnectOptions {
 	public final fun getUserPropertiesMap ()Ljava/util/Map;
 	public final fun getUsername ()Ljava/lang/String;
 	public final fun getVersion ()Lcom/gojek/mqtt/model/MqttVersion;
-	public final fun getWill ()Lcom/gojek/mqtt/model/Will;
 	public final fun getX509TrustManager ()Ljavax/net/ssl/X509TrustManager;
 	public final fun isCleanSession ()Z
 	public final fun newBuilder ()Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
@@ -1065,7 +1064,6 @@ public final class com/gojek/mqtt/model/MqttConnectOptions$Builder {
 	public final fun alpnProtocols (Ljava/util/List;)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
 	public final fun build ()Lcom/gojek/mqtt/model/MqttConnectOptions;
 	public final fun cleanSession (Z)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
-	public final fun clearWill ()Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
 	public final fun clientId (Ljava/lang/String;)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
 	public final fun connectionSpec (Lorg/eclipse/paho/client/mqttv3/ConnectionSpec;)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
 	public final fun keepAlive (Lcom/gojek/mqtt/model/KeepAlive;)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
@@ -1077,7 +1075,6 @@ public final class com/gojek/mqtt/model/MqttConnectOptions$Builder {
 	public final fun sslSocketFactory (Ljavax/net/ssl/SSLSocketFactory;Ljavax/net/ssl/X509TrustManager;)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
 	public final fun userName (Ljava/lang/String;)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
 	public final fun userProperties (Ljava/util/Map;)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
-	public final fun will (Lcom/gojek/mqtt/model/Will;)Lcom/gojek/mqtt/model/MqttConnectOptions$Builder;
 }
 
 public final class com/gojek/mqtt/model/MqttConnectOptions$Companion {
@@ -1106,23 +1103,6 @@ public final class com/gojek/mqtt/model/ServerUri {
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/gojek/mqtt/model/Will {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/gojek/courier/QoS;Z)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Lcom/gojek/courier/QoS;
-	public final fun component4 ()Z
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Lcom/gojek/courier/QoS;Z)Lcom/gojek/mqtt/model/Will;
-	public static synthetic fun copy$default (Lcom/gojek/mqtt/model/Will;Ljava/lang/String;Ljava/lang/String;Lcom/gojek/courier/QoS;ZILjava/lang/Object;)Lcom/gojek/mqtt/model/Will;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMessage ()Ljava/lang/String;
-	public final fun getQos ()Lcom/gojek/courier/QoS;
-	public final fun getRetained ()Z
-	public final fun getTopic ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class com/gojek/mqtt/network/ActiveNetInfo {
 	public fun <init> (ZZS)V
 	public final fun component1 ()Z

diff --git a/mqtt-client/src/main/java/com/gojek/mqtt/client/v3/impl/AndroidMqttClient.kt b/mqtt-client/src/main/java/com/gojek/mqtt/client/v3/impl/AndroidMqttClient.kt
@@ -522,7 +522,6 @@ internal class AndroidMqttClient(
                 .keepAlive(keepAliveProvider.getKeepAlive(connectOptions))
                 .clientId(connectOptions.clientId + ":adaptive")
                 .cleanSession(true)
-                .clearWill()
                 .build()
         } else {
             connectOptions.newBuilder()

diff --git a/mqtt-client/src/main/java/com/gojek/mqtt/connection/MqttConnection.kt b/mqtt-client/src/main/java/com/gojek/mqtt/connection/MqttConnection.kt
@@ -184,16 +184,6 @@ internal class MqttConnection(
                 connectionSpec = mqttConnectOptions.connectionSpec
                 alpnProtocolList = mqttConnectOptions.protocols
             }
-
-            mqttConnectOptions.will?.apply {
-                options?.setWill(
-                    topic,
-                    message.toByteArray(),
-                    qos.value,
-                    retained
-                )
-            }
-
             // Setting some connection options which we need to reset on every connect
 
             logger.d(TAG, "MQTT connecting on : " + mqtt!!.serverURI)

diff --git a/mqtt-client/src/main/java/com/gojek/mqtt/model/MqttConnectOptions.kt b/mqtt-client/src/main/java/com/gojek/mqtt/model/MqttConnectOptions.kt
@@ -41,10 +41,7 @@ class MqttConnectOptions private constructor(
 
     val protocols: List<Protocol> = builder.protocols
 
-    val will: Will? = builder.will
-
     init {
-
         if (connectionSpec.isTls.not()) {
             this.sslSocketFactory = null
             this.x509TrustManager = null
@@ -80,7 +77,6 @@ class MqttConnectOptions private constructor(
         internal var x509TrustManagerOrNull: X509TrustManager? = null
         internal var connectionSpec: ConnectionSpec = DEFAULT_CONNECTION_SPECS
         internal var protocols: List<Protocol> = emptyList()
-        internal var will: Will? = null
 
         internal constructor(mqttConnectOptions: MqttConnectOptions) : this() {
             this.serverUris = mqttConnectOptions.serverUris
@@ -97,7 +93,6 @@ class MqttConnectOptions private constructor(
             this.x509TrustManagerOrNull = mqttConnectOptions.x509TrustManager
             this.connectionSpec = mqttConnectOptions.connectionSpec
             this.protocols = mqttConnectOptions.protocols
-            this.will = mqttConnectOptions.will
         }
 
         fun serverUris(serverUris: List<ServerUri>) = apply {
@@ -209,14 +204,6 @@ class MqttConnectOptions private constructor(
             this.protocols = protocols
         }
 
-        fun will(will: Will) = apply {
-            this.will = will
-        }
-
-        fun clearWill() = apply {
-            this.will = null
-        }
-
         fun build(): MqttConnectOptions = MqttConnectOptions(this)
     }
 

diff --git a/mqtt-client/src/main/java/com/gojek/mqtt/model/Will.kt b/mqtt-client/src/main/java/com/gojek/mqtt/model/Will.kt