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

Optibp master merge #916

Open
wants to merge 15 commits into
base: optibp_main
Choose a base branch
from
Open

Optibp master merge #916

Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3291263
Merge pull request #891 from opensrp/android_12_support
junaidwarsivd Oct 27, 2022
646e553
AncSyncConfiguration updated
junaidwarsivd Oct 31, 2022
647ca20
AncSyncConfiguration updated
junaidwarsivd Oct 31, 2022
9ce6fbe
removed unused imports
junaidwarsivd Oct 31, 2022
c9abcc7
switched SYNC_TYPE to teamId
junaidwarsivd Oct 31, 2022
e71b751
added gradlePluginPortal() instead of jcenter
junaidwarsivd Oct 31, 2022
9891ded
gradlePluginPortal
SebaMutuku Nov 2, 2022
af16eae
gradlePluginPortal -1
SebaMutuku Nov 2, 2022
8772243
Confirming GradlePluginPortal is required in place of JCENTER
SebaMutuku Nov 2, 2022
b4682e7
Merge pull request #914 from opensrp/issue-fix-909
junaidwarsivd Nov 2, 2022
78632b6
Merge branch 'master' into optibp-master-merge
junaidwarsivd Nov 3, 2022
7f79a31
fixed the failing tests
junaidwarsivd Nov 3, 2022
1f2aa07
tests and client core version updated
junaidwarsivd Nov 4, 2022
689fbe9
Merge branch 'syncConfig-tests' into optibp-master-merge
junaidwarsivd Nov 4, 2022
fd8e380
Merge branch 'optibp_main' into optibp-master-merge
SebaMutuku Mar 7, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Android CI with Gradle

on:
push:
branches: [ master, develop]
branches: [ master, develop,optibp_main,brazil_main]
pull_request:
branches: [ master, develop]
branches: [ master, develop,optibp_main,brazil_main]

jobs:
build:
Expand Down
10 changes: 4 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
repositories {
google()
mavenCentral()
jcenter()
gradlePluginPortal()
maven { url 'https://maven.fabric.io/public' }
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
maven{ url 'https://plugins.gradle.org/m2/' }
Expand All @@ -23,8 +23,6 @@ buildscript {
}
}

//apply plugin: 'com.palantir.jacoco-full-report'
apply plugin: 'com.github.kt3k.coveralls'

configure(allprojects) { project ->

Expand All @@ -34,7 +32,7 @@ configure(allprojects) { project ->
repositories {
google()
mavenCentral()
jcenter()
gradlePluginPortal()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
maven { url 'https://plugins.gradle.org/m2/'}
mavenLocal()
Expand All @@ -49,14 +47,14 @@ allprojects {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
mavenLocal()
mavenCentral()
gradlePluginPortal()
maven { url 'https://jitpack.io' }
maven { url "https://acra.googlecode.com/svn/repository/releases" }
maven { url "https://repo.maven.apache.org/maven2" }
maven { url "https://cloudant.github.io/cloudant-sync-eap/repository" }
maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
//maven { url "https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases" }
google()
jcenter()
}

subprojects {
Expand All @@ -79,7 +77,7 @@ subprojects {

ext.androidToolsBuildGradle = '30.0.3'
ext.androidBuildToolsVersion = '30.0.3'
ext.androidMinSdkVersion = 18
ext.androidMinSdkVersion = 21
ext.androidCompileSdkVersion = 31
ext.androidTargetSdkVersion = 31
ext.androidAnnotationsVersion = '3.0.1'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ POM_SETTING_LICENCE_NAME=The Apache Software License, Version 2.0
android.useAndroidX=true
android.enableJetifier=true
android.debug.obsoleteApi=true
VERSION_NAME=2.1.0-SNAPSHOT
VERSION_NAME=3.0.0-SNAPSHOT
GROUP=org.smartregister
POM_SETTING_DESCRIPTION=OpenSRP Client ANC Library
POM_SETTING_SCM_CONNECTION=scm\:[email protected]\:OpenSRP/opensrp-client-anc.git
Expand Down
15 changes: 9 additions & 6 deletions opensrp-anc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ buildscript {
repositories {
mavenCentral()
google()
maven {
url "https://s3.amazonaws.com/repo.commonsware.com"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.10.2'
classpath 'com.google.gms:google-services:4.3.10'
classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.0'
classpath 'com.google.gms:google-services:4.3.14'
}
configurations.all {
resolutionStrategy {
Expand Down Expand Up @@ -178,7 +181,7 @@ tasks.withType(Test) {

dependencies {
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation('org.smartregister:opensrp-client-native-form:3.1.0-PREVIEW-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-native-form:3.1.1-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.android.support', module: 'recyclerview-v7'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand All @@ -189,7 +192,7 @@ dependencies {
exclude group: 'org.yaml', module: 'snakeyaml'
exclude group: 'io.ona.rdt-capture', module: 'lib'
}
implementation('org.smartregister:opensrp-client-core:4.3.26-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-core:6.0.0-BETA3-SNAPSHOT@aar') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use 6.0.0-SNAPSHOT for client-core

transitive = true
exclude group: 'com.github.bmelnychuk', module: 'atv'
exclude group: 'com.google.guava', module: 'guava'
Expand All @@ -205,7 +208,7 @@ dependencies {
exclude group: 'org.smartregister', module: 'android-p2p-sync'
}

api("org.smartregister:android-p2p-sync:0.3.8-aplha4-SNAPSHOT") {
api("org.smartregister:android-p2p-sync:0.4.0-DEV-SNAPSHOT") {
transitive = true
exclude group: 'org.smartregister', module: 'opensrp-client-core'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand Down Expand Up @@ -255,7 +258,7 @@ dependencies {
implementation("com.itextpdf:itext7-core:7.1.12")
implementation 'org.jacoco:org.jacoco.agent:0.7.9:runtime'
testImplementation 'org.jacoco:org.jacoco.agent:0.7.9:runtime'

implementation 'com.android.volley:volley:1.2.1'
implementation 'org.jacoco:org.jacoco.agent:0.8.7:runtime'
testImplementation 'org.jacoco:org.jacoco.agent:0.8.7:runtime'

Expand Down
5 changes: 4 additions & 1 deletion opensrp-anc/src/main/assets/config/profile_contact_tab_contacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ fields:
relevance: "phys_symptoms != ''"

- template: "{{profile_contact_tab_contacts.average_weight_gain_per_week_since_last_contact}}: {weight_gain} kg"
relevance: "weight_gain != ''"
relevance: "weight_gain != '' && weight_gain != '0'"

- template: "{{profile_contact_tab_contacts.total_weight_gain}}: {tot_weight_gain} kg"
relevance: "weight_gain == '' || weight_gain == '0'"
38 changes: 38 additions & 0 deletions opensrp-anc/src/main/assets/json.form/anc_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,44 @@
}
}
},
{
"key": "accordion_covid-19",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"text": "{{anc_test.step2.accordion_covid_19.text}}",
"accordion_info_text": "{{anc_test.step2.accordion_covid_19.text}}",
"accordion_info_title": "{{anc_test.step2.accordion_covid_19.text}}",
"type": "expansion_panel",
"content_form": "tests_covid_19_sub_form",
"container": "anc_test",
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "tests_expansion_panel_relevance_rules.yml"
}
}
}
},
{
"key": "accordion_toxo",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"text": "{{anc_test.step2.accordion_toxo.text}}",
"accordion_info_text": "{{anc_test.step2.accordion_toxo.info.text}}",
"accordion_info_title": "{{anc_test.step2.accordion_toxo.text}}",
"type": "expansion_panel",
"content_form": "tests_toxo_sub_form",
"container": "anc_test",
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "tests_expansion_panel_relevance_rules.yml"
}
}
}
},
{
"key": "accordion_syphilis",
"openmrs_entity_parent": "",
Expand Down
Loading