Merge pull request #83 from jumaallan/deps-updates

Update AS & Libraries
jumaallan · Feb 16, 2023 · 980544b · 980544b
2 parents 4659a35 + f276127
commit 980544b
Show file tree

Hide file tree

Showing 13 changed files with 473 additions and 261 deletions.
diff --git a/README.md b/README.md
@@ -12,15 +12,15 @@ Kotlin
 
 ```kotlin
 dependencies {
-    implementation("com.androidstudy.daraja:daraja:2.0.1")
+    implementation("com.androidstudy.daraja:daraja:2.0.2")
 }
 ```
 
 Groovy
 
 ```groovy
 dependencies {
-    implementation 'com.androidstudy.daraja:daraja:2.0.1'
+    implementation 'com.androidstudy.daraja:daraja:2.0.2'
 }
 ```
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,6 +22,7 @@ android {
         targetSdk = AndroidSdk.targetSdkVersion
         versionCode = AndroidSdk.versionCode
         versionName = AndroidSdk.versionName
+        multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner = "com.androidstudy.mpesa.runner.MockTestRunner"
     }
@@ -65,6 +66,7 @@ android {
             isMinifyEnabled = true
         }
     }
+    namespace = "com.androidstudy.mpesa"
 }
 
 kapt {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?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="com.androidstudy.mpesa">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -16,7 +15,8 @@
 
         <activity
             android:name=".ui.PaymentActivity"
-            android:label="@string/title_activity_payment">
+            android:label="@string/title_activity_payment"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/com/androidstudy/mpesa/ui/PaymentActivity.kt b/app/src/main/java/com/androidstudy/mpesa/ui/PaymentActivity.kt
@@ -75,7 +75,13 @@ class PaymentActivity : AppCompatActivity() {
         } else {
             // initiate payment
             showProgressDialog()
-            daraja.initiatePayment(token, phoneNumber, amount.toString(), AppUtils.generateUUID(), "Payment") { darajaResult ->
+            daraja.initiatePayment(
+                token,
+                phoneNumber,
+                amount.toString(),
+                AppUtils.generateUUID(),
+                "Payment"
+            ) { darajaResult ->
                 dismissProgressDialog()
                 when (darajaResult) {
                     is DarajaResult.Success -> {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,7 @@ allprojects {
 }
 
 buildscript {
-    val kotlinVersion by extra("1.5.21")
+    val kotlinVersion by extra("1.6.21")
     val jacocoVersion by extra("0.2")
     val nexusPublishVersion by extra("1.1.0")
 

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,52 +1,52 @@
 object Versions {
 
     // Material and androidX
-    const val material = "1.3.0-alpha02"
-    const val constraintLayout = "2.0.1"
+    const val material = "1.9.0-alpha01"
+    const val constraintLayout = "2.1.4"
 
     // Firebase
     const val firebase = "26.2.0"
 
     //Networking
     const val retrofit = "2.9.0"
-    const val okhttp = "4.8.1"
-    const val loggingInterceptor = "4.8.1"
+    const val okhttp = "4.10.0"
+    const val loggingInterceptor = "4.10.0"
 
     // Lifecycle
-    const val lifecycle = "2.2.0"
+    const val lifecycle = "2.6.0-beta01"
 
     // Logging - debug builds
-    const val timber = "4.7.1"
-    const val leakCanary = "2.4"
-    const val chucker = "3.4.0"
+    const val timber = "5.0.1"
+    const val leakCanary = "2.10"
+    const val chucker = "3.5.2"
 
     // Kotlin
-    const val kotlinVersion = "1.5.21"
-    const val coreKtx = "1.5.0-alpha02"
+    const val kotlinVersion = "1.8.0"
+    const val coreKtx = "1.10.0-alpha02"
 
     // Gradle Plugins
-    const val ktlint = "10.1.0"
-    const val detekt = "1.18.0"
-    const val spotless = "5.9.0"
+    const val ktlint = "11.2.0"
+    const val detekt = "1.22.0"
+    const val spotless = "6.15.0"
     const val jacoco = "0.8.4"
-    const val dokka = "1.5.0"
-    const val gradleVersionsPlugin = "0.29.0"
+    const val dokka = "1.7.20"
+    const val gradleVersionsPlugin = "0.45.0"
 
     // tests
     const val junit = "4.13"
-    const val espresso = "3.3.0"
-    const val roboelectric = "4.4-beta-1"
-    const val androidXJUnit = "1.1.1"
-    const val truth = "1.0.1"
-    const val mockWebServer = "4.8.1"
-    const val androidXTestCore = "1.3.0"
-    const val runner = "1.3.0"
-    const val rules = "1.3.0"
+    const val espresso = "3.5.1"
+    const val roboelectric = "4.9.2"
+    const val androidXJUnit = "1.1.5"
+    const val truth = "1.1.3"
+    const val mockWebServer = "4.10.0"
+    const val androidXTestCore = "1.5.0"
+    const val runner = "1.5.2"
+    const val rules = "1.5.0"
     const val archComponentTest = "2.1.0"
-    const val kakao = "2.3.4"
+    const val kakao = "2.4.0"
     const val mockK = "1.10.0"
     const val liveDataTesting = "1.1.2"
-    const val kotlinxCoroutines = "1.2.1"
+    const val kotlinxCoroutines = "1.6.4"
 }
 
 object BuildPlugins {
@@ -86,7 +86,7 @@ object Libraries {
             "com.squareup.okhttp3:logging-interceptor:${Versions.loggingInterceptor}"
 
     // Lifecycle
-    const val lifecycle = "androidx.lifecycle:lifecycle-extensions:${Versions.lifecycle}"
+    const val lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}"
 
     // Debug - for debug builds only
     const val timber = "com.jakewharton.timber:timber:${Versions.timber}"
@@ -124,7 +124,7 @@ object BuildModules {
 
 object AndroidSdk {
     const val minSdkVersion = 16
-    const val compileSdkVersion = 30
+    const val compileSdkVersion = 33
     const val targetSdkVersion = compileSdkVersion
     const val versionCode = 1
     const val versionName = "1.0"

diff --git a/daraja/build.gradle.kts b/daraja/build.gradle.kts
@@ -49,6 +49,7 @@ android {
             isMinifyEnabled = false
         }
     }
+    namespace = "com.androidstudy.daraja"
 }
 
 dependencies {
@@ -76,7 +77,7 @@ tasks {
         isFailOnError = false
         dependsOn(android.libraryVariants.toList().last().javaCompileProvider)
 
-        if (! project.plugins.hasPlugin("org.jetbrains.kotlin.android")) {
+        if (!project.plugins.hasPlugin("org.jetbrains.kotlin.android")) {
             setSource(sourceFiles)
         }
         android.bootClasspath.forEach { classpath += project.fileTree(it) }

diff --git a/daraja/src/main/AndroidManifest.xml b/daraja/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.androidstudy.daraja" />
+<manifest />
diff --git a/daraja/src/main/java/com/androidstudy/daraja/Daraja.kt b/daraja/src/main/java/com/androidstudy/daraja/Daraja.kt
@@ -15,11 +15,13 @@
  */
 package com.androidstudy.daraja
 
-import com.androidstudy.daraja.callback.*
-import com.androidstudy.daraja.util.TransactionType
+import com.androidstudy.daraja.callback.DarajaCallback
+import com.androidstudy.daraja.callback.DarajaPaymentCallback
+import com.androidstudy.daraja.callback.DarajaResult
 import com.androidstudy.daraja.data.model.AccessToken
 import com.androidstudy.daraja.data.model.PaymentResult
 import com.androidstudy.daraja.data.repo.DarajaRepository
+import com.androidstudy.daraja.util.TransactionType
 
 /**
  * Creates Mpesa Payment Payload Details
@@ -42,7 +44,14 @@ object Daraja {
         repo.accessToken.enqueue(DarajaCallback(callback))
     }
 
-    fun initiatePayment(token: String, phoneNumber: String, amount: String, accountReference: String, description: String, callback: ((darajaResult: DarajaResult<PaymentResult>) -> Unit)) {
+    fun initiatePayment(
+        token: String,
+        phoneNumber: String,
+        amount: String,
+        accountReference: String,
+        description: String,
+        callback: ((darajaResult: DarajaResult<PaymentResult>) -> Unit)
+    ) {
         repo.initiatePayment(
             token = token,
             phoneNumber = phoneNumber,

diff --git a/daraja/src/main/java/com/androidstudy/daraja/callback/DarajaPaymentCallback.kt b/daraja/src/main/java/com/androidstudy/daraja/callback/DarajaPaymentCallback.kt
@@ -48,7 +48,6 @@ class DarajaPaymentCallback(
                 val error = gson.fromJson(response.errorBody()?.string(), ErrorResponse::class.java)
                 callback.invoke(DarajaResult.Failure(false, DarajaException(error)))
             } catch (e: IOException) {
-                e.printStackTrace()
                 callback.invoke(DarajaResult.Failure(false, DarajaException("${response.code()}")))
             }
         }