Update ci github workflow

opensrp · Mar 6, 2024 · ca2eec6 · ca2eec6
1 parent 60f64c3
commit ca2eec6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/ci-mwcore.yml b/.github/workflows/ci-mwcore.yml
@@ -2,9 +2,9 @@ name: CI MwCore
 
 on:
   push:
-    branches: [ mwcore-dev ]
+    branches: [mwcore-dev]
   pull_request:
-    branches: [ mwcore-dev ]
+    branches: [mwcore-dev]
 
 env:
   FHIRCORE_USERNAME: ${{ secrets.FHIRCORE_USERNAME }}
@@ -33,7 +33,7 @@ jobs:
       - name: Decode google-services.json
         run: echo $ENCODED_GOOGLE_SERVICES_JSON | base64 -d > android/quest/google-services.json
         env:
-          ENCODED_GOOGLE_SERVICES_JSON: ${{ secrets.MWCORE_GOOGLE_SERVICES_JSON }}
+          ENCODED_GOOGLE_SERVICES_JSON: ${{ secrets.DATACLERK_GOOGLE_SERVICES_JSON }}
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -65,11 +65,6 @@ jobs:
         with:
           java-version: 17
 
-      - name: Decode google-services.json
-        run: echo $ENCODED_GOOGLE_SERVICES_JSON | base64 -d > android/quest/google-services.json
-        env:
-          ENCODED_GOOGLE_SERVICES_JSON: ${{ secrets.MWCORE_GOOGLE_SERVICES_JSON }}
-
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
         working-directory: android
@@ -78,10 +73,6 @@ jobs:
         run: ./gradlew :engine:spotlessCheck
         working-directory: android
 
-      - name: Builds
-        run: ./gradlew :engine:assembleDebug
-        working-directory: android
-
       # - name: Run Engine unit tests with Gradle
       #   run: ./gradlew :engine:clean && ./gradlew :engine:jacocoTestReport -x :engine:testReleaseUnitTest --stacktrace
       #   working-directory: android

diff --git a/android/engine/build.gradle.kts b/android/engine/build.gradle.kts
@@ -105,7 +105,7 @@ dependencies {
   implementation("androidx.fragment:fragment-ktx:1.5.5")
   implementation("io.jsonwebtoken:jjwt:0.9.1")
   implementation("androidx.security:security-crypto:1.1.0-alpha03")
-  implementation("org.smartregister:fhir-common-utils:1.0.0-SNAPSHOT")
+  api("org.smartregister:fhir-common-utils:1.0.0-SNAPSHOT")
   implementation("com.squareup.okhttp3:logging-interceptor:4.9.1")
   implementation("com.squareup.okhttp3:okhttp:4.9.1")
   implementation("androidx.cardview:cardview:1.0.0")
@@ -151,7 +151,7 @@ dependencies {
   implementation("androidx.datastore:datastore-preferences:1.0.0")
 
   // P2P dependency
-  implementation("org.smartregister:p2p-lib:0.3.0-SNAPSHOT")
+  api("org.smartregister:p2p-lib:0.3.0-SNAPSHOT")
 
   // Configure Jetpack Compose
   val composeVersion = Deps.versions.compose

diff --git a/...main/java/org/smartregister/fhircore/engine/data/local/register/dao/TracingRegisterDao.kt b/...main/java/org/smartregister/fhircore/engine/data/local/register/dao/TracingRegisterDao.kt
@@ -55,6 +55,7 @@ import org.smartregister.fhircore.engine.domain.model.ProfileData
 import org.smartregister.fhircore.engine.domain.model.RegisterData
 import org.smartregister.fhircore.engine.domain.repository.RegisterDao
 import org.smartregister.fhircore.engine.domain.util.PaginationConstant
+import org.smartregister.fhircore.engine.util.DispatcherProvider
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.asDdMmmYyyy

diff --git a/android/quest/build.gradle.kts b/android/quest/build.gradle.kts
@@ -184,8 +184,6 @@ dependencies {
   coreLibraryDesugaring(Deps.desugar)
   implementation(project(":engine"))
   implementation("androidx.ui:ui-foundation:0.1.0-dev14")
-  implementation("org.smartregister:p2p-lib:0.3.0-SNAPSHOT")
-  implementation("org.smartregister:fhir-common-utils:0.0.6-SNAPSHOT")
   implementation(Deps.accompanist.swiperefresh)
 
   implementation("com.github.anrwatchdog:anrwatchdog:1.4.0")