Merge branch 'main' into issue/31

Author: anubhav7nov

.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

.github/workflows/publish-docs.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     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: Build website
         run: |

README.md

@@ -198,7 +198,7 @@ This is a non-standard option. As far as the MQTT specification is concerned, us
 
 ## Contribution Guidelines
 
-Read our [contribution guide](./CONTRIBUTION.md) to learn about our development process, how to propose bugfixes and improvements, and how to build and test your changes to Courier Android library.
+Read our [contribution guide](./CONTRIBUTING.md) to learn about our development process, how to propose bugfixes and improvements, and how to build and test your changes to Courier Android library.
 
 ## License
 

app/build.gradle

@@ -3,13 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
+    compileSdk 34
+
+    namespace = "com.gojek.courier.app"
 
     defaultConfig {
         applicationId "com.gojek.courier.app"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         multiDexEnabled true

app/src/main/java/com/gojek/courier/app/ui/MainActivity.kt

@@ -29,6 +29,7 @@ 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
@@ -122,12 +123,21 @@ 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()
 

build.gradle.kts

@@ -21,6 +21,7 @@ buildscript {
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokkaGradlePlugin}")
         classpath("io.gitlab.arturbosch.detekt" +
             ":detekt-gradle-plugin:${versions.detekt}")
+        classpath(kotlin("serialization", version = versions.kotlin))
     }
 }
 

buildSrc/build.gradle.kts

@@ -34,8 +34,8 @@ plugins {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:7.0.3")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
+    implementation("com.android.tools.build:gradle:7.4.2")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
     implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.0")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.5.0")
 }

buildSrc/src/main/kotlin/deps.kt

@@ -4,12 +4,13 @@ object versions {
     const val jacoco = "0.8.6"
     const val detekt = "1.18.0"
 
-    const val kotlin = "1.4.30"
-    const val agp = "7.0.3"
+    const val kotlin = "1.6.21"
+    const val agp = "7.4.2"
     const val jetifierProcessor = "1.0.0-beta10"
-    const val jfrogBuildInfoExtractor = "4.11.0"
+    const val jfrogBuildInfoExtractor = "4.23.4"
     const val navigation = "2.1.0-rc01"
     const val coroutines = "1.3.2"
+    const val serialization = "1.3.3"
     const val broadcast = "1.0.0"
     const val lifecycle = "2.4.1"
     const val room = "2.2.5"
@@ -30,7 +31,7 @@ object versions {
     const val materialVersion = "1.3.0"
     const val annotationVersion = "1.2.0"
     const val coreKtxVersion = "1.3.0"
-    const val apiValidator = "0.6.0"
+    const val apiValidator = "0.14.0"
     const val workManager = "2.7.0"
 }
 
@@ -45,11 +46,11 @@ object deps {
         const val protobuf = "com.google.protobuf:protobuf-lite:3.0.0"
 
         object build {
-            const val buildToolsVersion = "31.0.0"
-            const val compileSdkVersion = 31
+            const val buildToolsVersion = "33.0.1"
+            const val compileSdkVersion = 34
             const val minSdkVersion = 21
             const val sampleMinSdkVersion = 21
-            const val targetSdkVersion = 31
+            const val targetSdkVersion = 34
         }
 
         object test {
@@ -104,6 +105,8 @@ object deps {
                 "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
             const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${versions.coroutines}"
         }
+
+        const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:${versions.serialization}"
     }
 
     object logger {
@@ -134,4 +137,4 @@ object deps {
         const val runtime = "androidx.work:work-runtime:${versions.workManager}"
         const val runtime_2_6_0 = "androidx.work:work-runtime:2.6.0"
     }
-}
+}

courier-core-android/api/courier-core-android.api

@@ -1,3 +0,0 @@
-public final class com/gojek/courier/utils/extensions/PendingIntentExtensionsKt {
-}
-

courier-core/api/courier-core.api

@@ -72,12 +72,6 @@ public final class com/gojek/courier/extensions/CollectionExtensionsKt {
 	public static final fun toImmutableSet (Ljava/util/Set;)Ljava/util/Set;
 }
 
-public final class com/gojek/courier/extensions/StringExtensionsKt {
-}
-
-public final class com/gojek/courier/extensions/TimeUnitExtensionsKt {
-}
-
 public abstract interface class com/gojek/courier/logging/ILogger {
 	public abstract fun d (Ljava/lang/String;Ljava/lang/String;)V
 	public abstract fun d (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
@@ -92,6 +86,3 @@ public abstract interface class com/gojek/courier/logging/ILogger {
 	public abstract fun w (Ljava/lang/String;Ljava/lang/Throwable;)V
 }
 
-public final class com/gojek/courier/utils/TypeUtils {
-}
-