update android version and remove livedata handling

Author: smilecs

build.gradle

@@ -2,7 +2,7 @@
 apply from: 'dependencies.gradle'
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()

kcore/src/main/java/com/past3/ketro/kcore/model/Kexception.kt

@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdkVersion 30
+        targetSdkVersion 34
         versionCode 4
         versionName "1.4"
 
@@ -35,20 +35,15 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
-    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
-    kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.mockito:mockito-core:$mockitoCoreVersion"
     testImplementation "org.mockito:mockito-inline:$mockitoInlineVersion"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlinVersion"
-    api project(path: ':kcore')
-    api project(path: ':request')
 }
 repositories {
     google()

ketro/build.gradle

@@ -1,6 +1,6 @@
 package com.past3.ketro.api
 
-import com.past3.ketro.kcore.model.StatusCode
+import com.past3.ketro.api.model.StatusCode
 import retrofit2.Call
 import retrofit2.Callback
 
@@ -12,6 +12,7 @@ abstract class ApiCallback<T>(private val errorHandler: ApiErrorHandler) : Callb
             in 200 until 209 -> {
                 handleResponseData(response.body(), statusCode)
             }
+
             else -> {
                 handleError(response, statusCode)
             }

ketro/src/main/java/com/past3/ketro/api/ApiCallback.kt

@@ -1,7 +1,7 @@
 package com.past3.ketro.api
 
-import com.past3.ketro.kcore.model.Kexception
-import com.past3.ketro.kcore.model.StatusCode
+import com.past3.ketro.api.model.KException
+import com.past3.ketro.api.model.StatusCode
 
 /*
 *ApiErrorHandler class should be extended to handle custom exceptions
@@ -15,7 +15,12 @@ open class ApiErrorHandler {
     *  return a sub-type of kexception()
     */
     open fun getExceptionType(response: retrofit2.Response<*>): Exception {
-        return Kexception(response.errorBody(), response.message(), null, StatusCode(response.code()))
+        return KException(
+            response.errorBody(),
+            response.message(),
+            null,
+            StatusCode(response.code())
+        )
     }
 
 

ketro/src/main/java/com/past3/ketro/api/ApiErrorHandler.kt

@@ -1,13 +1,13 @@
 package com.past3.ketro.api
 
 import androidx.annotation.VisibleForTesting
-import com.past3.ketro.kcore.model.KResponse
-import com.past3.ketro.kcore.model.StatusCode
-import com.past3.ketro.kcore.model.Wrapper
+import com.past3.ketro.api.model.KResponse
+import com.past3.ketro.api.model.StatusCode
+import com.past3.ketro.api.model.Wrapper
 import retrofit2.Response
 
 abstract class Request<out T : Any>(
-        private val errorHandler: ApiErrorHandler = ApiErrorHandler()
+    private val errorHandler: ApiErrorHandler = ApiErrorHandler()
 ) {
 
     abstract suspend fun apiRequest(): Response<out T>
@@ -19,6 +19,7 @@ abstract class Request<out T : Any>(
             in 200 until 209 -> {
                 handleResponseData(resp.body(), statusCode)
             }
+
             else -> {
                 handleError(resp, statusCode)
             }
@@ -32,6 +33,7 @@ abstract class Request<out T : Any>(
             in 200 until 209 -> {
                 KResponse.Success(resp.body(), statusCode)
             }
+
             else -> {
                 KResponse.Failure(errorHandler.getExceptionType(resp), statusCode)
             }
@@ -47,5 +49,4 @@ abstract class Request<out T : Any>(
     fun <T> handleError(response: Response<T>, statusCode: StatusCode): Wrapper<out T> {
         return Wrapper(errorHandler.getExceptionType(response), statusCode = statusCode)
     }
-
-}
+}

ketro/src/main/java/com/past3/ketro/api/GenericRequestHandler.kt

@@ -0,0 +1,10 @@
+package com.past3.ketro.api.model
+
+import okhttp3.ResponseBody
+
+
+open class KException(val errorBody: ResponseBody?,
+                      message: String?,
+                      cause: Throwable?,
+                      val statusCode: StatusCode
+) : Exception(message, cause)