Skip to content

Commit

Permalink
Merge branch 'main' into feature/fix_java_heap_error
Browse files Browse the repository at this point in the history
  • Loading branch information
dubdabasoduba authored Dec 16, 2024
2 parents 1325652 + ce5a557 commit 130b63a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions android/quest/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ android {
}

getByName("release") {
isMinifyEnabled = true
isShrinkResources = true
isMinifyEnabled = false
isShrinkResources = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ import org.smartregister.fhircore.engine.domain.model.ActionParameter
import org.smartregister.fhircore.engine.domain.model.ActionParameterType
import org.smartregister.fhircore.engine.domain.model.isEditable
import org.smartregister.fhircore.engine.domain.model.isReadOnly
import org.smartregister.fhircore.engine.domain.model.isSummary
import org.smartregister.fhircore.engine.rulesengine.RulesExecutor
import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
import org.smartregister.fhircore.engine.util.DispatcherProvider
Expand Down Expand Up @@ -1136,6 +1137,7 @@ constructor(
!resourceIdentifier.isNullOrEmpty() &&
(questionnaireConfig.isEditable() ||
questionnaireConfig.isReadOnly() ||
questionnaireConfig.isSummary() ||
questionnaireConfig.saveDraft)
) {
defaultRepository
Expand Down

0 comments on commit 130b63a

Please sign in to comment.