Merge pull request #121 from opensrp/update-core-and-fhir-versions

Update core and fhir model versions

Author: allan-on

build.gradle

@@ -12,7 +12,6 @@ buildscript {
     dependencies {
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
         classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.10.2'
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
     }
 }
 
@@ -56,14 +55,13 @@ subprojects {
         google()
         jcenter()
         mavenCentral()
+        mavenLocal()
         maven { url 'https://jitpack.io' }
         maven { url "http://acra.googlecode.com/svn/repository/releases" }
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "http://cloudant.github.io/cloudant-sync-eap/repository" }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-        maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'}
-        mavenLocal()
     }
 
     // Improve build server performance by allowing disabling of pre-dexing

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.1.1-SNAPSHOT
+VERSION_NAME=0.1.2-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Reporting Library

opensrp-reporting/build.gradle

@@ -14,7 +14,6 @@ apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
-apply plugin: "com.jfrog.bintray"
 
 jacoco {
     toolVersion = "0.8.5"
@@ -70,6 +69,7 @@ android {
         exclude 'META-INF/ASL2.0'
         exclude 'META-INF/LICENSE.md'
         exclude 'META-INF/NOTICE.md'
+        exclude 'META-INF/INDEX.LIST'
     }
 
     testOptions {
@@ -95,7 +95,7 @@ artifacts {
 }
 
 dependencies {
-    implementation('org.smartregister:opensrp-client-core:1.15.4-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:4.3.22-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'
@@ -106,7 +106,7 @@ dependencies {
         exclude group: 'com.ibm.fhir', module: 'fhir-model'
     }
 
-    compileOnly 'com.ibm.fhir:fhir-model:4.2.3'
+    compileOnly 'com.ibm.fhir:fhir-model:4.7.0'
 
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

opensrp-reporting/src/test/java/org/smartregister/reporting/dao/ReportIndicatorDaoImplTest.java

@@ -59,7 +59,7 @@ public class ReportIndicatorDaoImplTest {
     private IndicatorQueryRepository indicatorQueryRepository;
     @Mock
     private CoreLibrary coreLibrary;
-    @Mock
+
     private AppProperties appProperties;
     @Mock
     private Context context;
@@ -68,6 +68,12 @@ public class ReportIndicatorDaoImplTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         reportIndicatorDao = new ReportIndicatorDaoImpl(indicatorQueryRepository, dailyIndicatorCountRepository, indicatorRepository);
+        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
+
+        Mockito.when(coreLibrary.context()).thenReturn(context);
+        appProperties = new AppProperties();
+        appProperties.setProperty(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES, "true");
+        Mockito.when(context.getAppProperties()).thenReturn(appProperties);
     }
 
     @Test
@@ -112,13 +118,6 @@ public void testGenerateDailyIndicatorTalliesCallsSaveTalliesEqualToNumberOfRepo
         Repository repository = Mockito.mock(Repository.class);
         Mockito.doReturn(database).when(repository).getWritableDatabase();
 
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
-
-        Mockito.when(coreLibrary.context()).thenReturn(context);
-        Mockito.when(context.getAppProperties()).thenReturn(appProperties);
-        Mockito.when(appProperties.hasProperty(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES)).thenReturn(true);
-        Mockito.when(appProperties.getPropertyBoolean(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES)).thenReturn(true);
-
         ReportingLibrary reportingLibrarySpy = Mockito.mock(ReportingLibrary.class);
         ReflectionHelpers.setStaticField(ReportingLibrary.class, "instance", reportingLibrarySpy);
 
@@ -157,12 +156,6 @@ public void testGenerateDailyIndicatorTalliesCallsSaveTalliesEqualToNumberOfRepo
 
     @Test
     public void saveTalliesGeneratesTallyObject() {
-        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
-
-        Mockito.when(coreLibrary.context()).thenReturn(context);
-        Mockito.when(context.getAppProperties()).thenReturn(appProperties);
-        Mockito.when(appProperties.hasProperty(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES)).thenReturn(true);
-        Mockito.when(appProperties.getPropertyBoolean(Constants.ReportingConfig.SHOULD_ALLOW_ZERO_TALLIES)).thenReturn(true);
 
         SQLiteDatabase database = Mockito.mock(SQLiteDatabase.class);
         Map<String, IndicatorQuery> indicatorQueries = new HashMap<>();

sample/build.gradle

@@ -64,6 +64,7 @@ android {
         exclude 'META-INF/LICENSE.md'
         exclude 'META-INF/NOTICE.md'
         exclude 'META-INF/LGPL2.1'
+        exclude 'META-INF/INDEX.LIST'
         exclude 'LICENSE.txt'
     }
 
@@ -88,7 +89,7 @@ dependencies {
         exclude group: 'org.apache.httpcomponents', module: 'httpmime'
         exclude group: 'com.ibm.fhir', module: 'fhir-model'
     }
-    compileOnly 'com.ibm.fhir:fhir-model:4.2.3'
+    compileOnly 'com.ibm.fhir:fhir-model:4.7.0'
 
     implementation project(":opensrp-reporting")