fix workflow

migrate to new github actions

Author: smilecs

.github/workflows/publish.yml

@@ -1,21 +1,21 @@
-name: Publish Package
-on:
-  release:
-    types: [published]
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Grant Permission to Execute
-      run: chmod +x gradlew
-    - name: Build Library
-      run: ./gradlew ketro:assemble
-    - name: Publish Library
-      run: ./gradlew ketro:publish
+#name: Publish Package
+#on:
+#  release:
+#    types: [published]
+#
+#jobs:
+#  publish:
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#    - uses: actions/checkout@v1
+#    - name: Set up JDK 1.8
+#      uses: actions/setup-java@v1
+#      with:
+#        java-version: 1.8
+#    - name: Grant Permission to Execute
+#      run: chmod +x gradlew
+#    - name: Build Library
+#      run: ./gradlew ketro:assemble
+#    - name: Publish Library
+#      run: ./gradlew ketro:publish

.github/workflows/pull.yml

@@ -0,0 +1,50 @@
+name: Test on Pull Request
+
+on:
+  pull_request:
+    branches:
+      - master # Specify the branches to run tests on PRs against
+
+jobs:
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      # Step 1: Check out the code
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Step 2: Set up JDK for the Android project
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      # Step 3: Cache Gradle dependencies to speed up builds
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      # Step 4: Build the project and run tests
+      - name: Run Unit Tests
+        run: ./gradlew test
+
+      # Step 5: Run Android Instrumentation Tests (Optional)
+      # Uncomment the following block to run instrumentation tests
+      # - name: Run Instrumentation Tests
+      #   run: ./gradlew connectedAndroidTest
+      #   env:
+      #     ANDROID_SDK_ROOT: ${{ env.ANDROID_HOME }}
+
+      # Step 6: Upload Test Results (Optional)
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-results
+          path: app/build/reports/tests/testDebugUnitTest

ketro/build.gradle

@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 30
         targetSdkVersion 34
-        versionCode 4
-        versionName "1.4"
+        versionCode 5
+        versionName "2.1.1"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
@@ -36,6 +36,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'

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

@@ -5,7 +5,6 @@ import retrofit2.Call
 import retrofit2.Callback
 
 abstract class ApiCallback<T>(private val errorHandler: ApiErrorHandler) : Callback<T> {
-
     override fun onResponse(call: Call<T>, response: retrofit2.Response<T>) {
         val statusCode = StatusCode(response.code())
         when (statusCode.code) {
@@ -34,5 +33,4 @@ abstract class ApiCallback<T>(private val errorHandler: ApiErrorHandler) : Callb
             //do something else
         }
     }
-
 }

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

@@ -8,8 +8,6 @@ import com.past3.ketro.api.model.StatusCode
 *
 **/
 open class ApiErrorHandler {
-
-
     /* Method should be overridden to return custom exception type which
     *  would be a sub-type of Exception or to have the response body,
     *  return a sub-type of kexception()
@@ -22,6 +20,4 @@ open class ApiErrorHandler {
             StatusCode(response.code())
         )
     }
-
-
-}
+}

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

@@ -1,6 +1,5 @@
 package com.past3.ketro.api
 
-import androidx.annotation.VisibleForTesting
 import com.past3.ketro.api.model.KResponse
 import com.past3.ketro.api.model.StatusCode
 import com.past3.ketro.api.model.Wrapper
@@ -9,7 +8,6 @@ import retrofit2.Response
 abstract class Request<out T : Any>(
     private val errorHandler: ApiErrorHandler = ApiErrorHandler()
 ) {
-
     abstract suspend fun apiRequest(): Response<out T>
 
     open suspend fun doRequest(): Wrapper<out T> {
@@ -40,13 +38,11 @@ abstract class Request<out T : Any>(
         }
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    fun <T> handleResponseData(data: T?, statusCode: StatusCode): Wrapper<out T> {
+    private fun <T> handleResponseData(data: T?, statusCode: StatusCode): Wrapper<out T> {
         return Wrapper(data = data, statusCode = statusCode)
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    fun <T> handleError(response: Response<T>, statusCode: StatusCode): Wrapper<out T> {
+    private 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/model/KException.kt

@@ -2,7 +2,6 @@ package com.past3.ketro.api.model
 
 import okhttp3.ResponseBody
 
-
 open class KException(val errorBody: ResponseBody?,
                       message: String?,
                       cause: Throwable?,

ketro/src/main/java/com/past3/ketro/api/model/KResponse.kt

@@ -1,7 +1,6 @@
 package com.past3.ketro.api.model
 
 sealed class KResponse<out T>(val statusCode: StatusCode) {
-
     class Success<T>(val data: T? = null, statusCode: StatusCode = StatusCode(-1)) :
         KResponse<T>(statusCode)
 

ketro/src/test/java/com/past3/ketro/api/MockObject.kt

@@ -3,9 +3,7 @@ package com.past3.ketro.api
 import retrofit2.Response
 
 object MockObject {
-
     fun provideUnitResponse(): Response<Unit> {
         return Response.success(200, Unit)
     }
-
 }

ketro/src/test/java/com/past3/ketro/api/RequestUnitTest.kt

@@ -1,6 +1,6 @@
 package com.past3.ketro.api
 
-import com.past3.ketro.kcore.model.KResponse
+import com.past3.ketro.api.model.KResponse
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith