Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate FHIR SDK Artifacts to latest #3376

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Migrate FHIR SDK Artifacts to latest #3376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2dd6f8
Upgrade FHIR SDK Libraries
ndegwamartin Jul 9, 2024
816522f
Fix i18N Bug : MLS rendering diacritical marks on configs
ndegwamartin Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.google.android.fhir.knowledge.KnowledgeManager
import dagger.hilt.android.qualifiers.ApplicationContext
import java.io.File
import java.io.FileNotFoundException
import java.io.InputStreamReader
import java.net.UnknownHostException
import java.nio.charset.StandardCharsets
import java.util.LinkedList
Expand Down Expand Up @@ -183,7 +184,9 @@ constructor(
val resourceBundle =
configsJsonMap[bundleName.camelCase()] // Convention for config map keys is camelCase
if (resourceBundle != null) {
return PropertyResourceBundle(resourceBundle.byteInputStream())
return PropertyResourceBundle(
InputStreamReader(resourceBundle.byteInputStream(), Charsets.UTF_8),
)
}
if (bundleName.contains("_")) {
return retrieveResourceBundleConfiguration(
Expand Down
28 changes: 14 additions & 14 deletions android/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ accompanist = "0.23.1"
activity-compose = "1.8.2"
androidJunit5 = "1.8.2.1"
androidx-paging = "3.3.0"
androidx-test= "1.5.2"
androidx-test= "1.6.1"
appcompat = "1.7.0"
benchmark-junit = "1.2.4"
cardview = "1.0.0"
commonsJexl3 = "3.2.1"
compose-material-icons = "1.6.3"
compose-material-icons = "1.6.8"
compressor = "3.0.1"
constraintlayout = "2.1.4"
constraintlayout-compose = "1.0.1"
Expand All @@ -22,16 +22,16 @@ datastore = "1.1.1"
desugar-jdk-libs = "2.0.4"
dokkaBase = "1.8.20"
easy-rules-jexl = "4.1.1-SNAPSHOT"
espresso-core = "3.5.1"
espresso-core = "3.6.1"
fhir-common-utils = "1.0.0-SNAPSHOT"
fhir-sdk-contrib-barcode = "0.1.0-beta3-preview7-SNAPSHOT"
fhir-sdk-contrib-locationwidget = "0.1.0-alpha01-preview2-SNAPSHOT"
fhir-sdk-data-capture = "1.1.0-preview11-SNAPSHOT"
fhir-sdk-engine = "1.0.0-preview10-SNAPSHOT"
fhir-sdk-data-capture = "1.1.0-preview12-SNAPSHOT"
fhir-sdk-engine = "1.0.0-preview11-SNAPSHOT"
fhir-sdk-knowledge = "0.1.0-alpha03-preview5-SNAPSHOT"
fhir-sdk-workflow = "0.1.0-alpha04-preview9-SNAPSHOT"
foundation = "1.6.3"
fragment-ktx = "1.6.2"
fhir-sdk-workflow = "0.1.0-alpha04-preview10-SNAPSHOT"
foundation = "1.6.8"
fragment-ktx = "1.8.1"
glide = "4.16.0"
gradle = "8.3.2"
gson = "2.10.1"
Expand All @@ -42,9 +42,9 @@ jjwt = "0.9.1"
joda-time = "2.10.14"
json = "20230618"
jsonPath = "2.8.0"
junit = "1.1.5"
junit = "1.2.1"
junit-jupiter = "5.9.3"
junit-ktx = "1.1.5"
junit-ktx = "1.2.1"
kotlin = "1.9.22"
kotlin-serialization = "1.8.10"
kotlinx-coroutines = "1.8.1"
Expand All @@ -53,16 +53,16 @@ kt3k-coveralls-ver="2.12.0"
ktlint = "0.50.0"
kujaku-library = "0.10.2-SNAPSHOT"
leakcanary-android = "2.10"
lifecycle= "2.8.2"
lifecycle= "2.8.3"
mapbox-sdk-turf = "4.8.0"
material = "1.11.0"
material = "1.12.0"
mockk = "1.13.8"
mockk-android = "1.13.8"
msg-simple = "1.2"
navigation = "2.7.7"
okhttp = "4.12.0"
okhttp-logging-interceptor = "4.12.0"
orchestrator = "1.4.2"
orchestrator = "1.5.0"
owasp = "8.2.1"
p2p-lib = "0.6.9-SNAPSHOT"
playServicesLocation = "21.3.0"
Expand All @@ -73,7 +73,7 @@ retrofit = "2.9.0"
retrofit-mock = "2.9.0"
retrofit2-kotlinx-serialization-converter = "0.8.0"
robolectric = "4.10.3"
rules = "1.5.0"
rules = "1.6.1"
security-crypto = "1.1.0-alpha06"
slf4j-nop = "1.7.36"
spotlessPluginGradle = "6.25.0"
Expand Down
Loading