From b2b49955038a467729d98ea643a45277b9eb857d Mon Sep 17 00:00:00 2001 From: Aurangzaib Umer Date: Mon, 29 Apr 2024 17:46:24 +0500 Subject: [PATCH 01/55] updating google location service dependency and removing unncessary module named as wrapper --- gradle.properties | 1 + library/build.gradle | 2 +- sample/build.gradle | 2 +- sample/src/main/AndroidManifest.xml | 6 ++ .../src/main/res/values/developer-config.xml | 4 + settings.gradle | 2 +- wrapper/.gitignore | 1 - wrapper/build.gradle | 87 ------------------ wrapper/proguard-rules.pro | 25 ----- wrapper/src/main/AndroidManifest.xml | 27 ------ .../wrapper/OfflineMapDownloderActivity.java | 14 --- .../layout/activity_offline_map_downloder.xml | 13 --- .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 4208 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 2555 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 6114 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10056 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 10486 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 14696 -> 0 bytes wrapper/src/main/res/values/colors.xml | 6 -- wrapper/src/main/res/values/strings.xml | 3 - wrapper/src/main/res/values/styles.xml | 11 --- .../ona/kujaku/wrapper/ExampleUnitTest.java | 17 ---- 26 files changed, 14 insertions(+), 207 deletions(-) create mode 100644 sample/src/main/res/values/developer-config.xml delete mode 100644 wrapper/.gitignore delete mode 100644 wrapper/build.gradle delete mode 100644 wrapper/proguard-rules.pro delete mode 100644 wrapper/src/main/AndroidManifest.xml delete mode 100644 wrapper/src/main/java/io/ona/kujaku/wrapper/OfflineMapDownloderActivity.java delete mode 100644 wrapper/src/main/res/layout/activity_offline_map_downloder.xml delete mode 100644 wrapper/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 wrapper/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 wrapper/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 wrapper/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 wrapper/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 wrapper/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 wrapper/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 wrapper/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 wrapper/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 wrapper/src/main/res/values/colors.xml delete mode 100644 wrapper/src/main/res/values/strings.xml delete mode 100644 wrapper/src/main/res/values/styles.xml delete mode 100644 wrapper/src/test/java/io/ona/kujaku/wrapper/ExampleUnitTest.java diff --git a/gradle.properties b/gradle.properties index cc3f99f3d..1f1bc68d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,6 +31,7 @@ POM_SETTING_DEVELOPER_ID=opensrp POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev android.useAndroidX=true android.enableJetifier=true +#MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiYXVyYW5nemFpYnVtZXIiLCJhIjoiY2x2a3dpazA1MXRhbTJqbnZtNjM0NnB1cCJ9.E1CnQczKA6U7yGtf-mO3Bw android.jetifier.ignorelist=shadows,bcprov-jdk15on #android.jetifier.blacklist=shadows,bcprov-jdk15on diff --git a/library/build.gradle b/library/build.gradle index a15be341f..c0788176c 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -173,7 +173,7 @@ private static void appPermissionsDependencies(configuration) { } private static void locationDependencies(configuration) { - configuration.implementation 'com.google.android.gms:play-services-location:19.0.1' + configuration.implementation 'com.google.android.gms:play-services-location:21.2.0' } tasks.withType(Test) { diff --git a/sample/build.gradle b/sample/build.gradle index 30573d486..784254475 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -18,7 +18,7 @@ android { defaultConfig { applicationId "io.ona.kujaku.sample" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion rootProject.ext.targetSdkVersion versionCode getMasterCommitCount() versionName getVersionName() diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 49fc5d123..9908013bf 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -2,6 +2,12 @@ + + + + + + + + pk.eyJ1IjoiYXVyYW5nemFpYnVtZXIiLCJhIjoiY2xyNjgxMWdyMXNjaTJqbnY5ODhmbWlkcSJ9.SjE_XmUVxLsZDSPlYYvRXQ + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f7a0a7526..f904d5b1b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':library', ':sample', ':wrapper', ':utils' +include ':library', ':sample', ':utils' diff --git a/wrapper/.gitignore b/wrapper/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/wrapper/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/wrapper/build.gradle b/wrapper/build.gradle deleted file mode 100644 index 3ca288ace..000000000 --- a/wrapper/build.gradle +++ /dev/null @@ -1,87 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'jacoco' - -jacoco { - toolVersion = jacocoVersion -} - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - defaultConfig { - applicationId "io.ona.kujaku.wrapper" - minSdkVersion 16 - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - - testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' - multiDexEnabled true - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - - debug { - // See bug https://github.com/vanniktech/gradle-android-junit-jacoco-plugin/issues/183 - testCoverageEnabled false - } - } - - lintOptions { - abortOnError false - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0' - - implementation (project(':library')) { - exclude group: 'com.google.code.findbugs', module: 'jsr305' - } - androidTestImplementation ('androidx.test.espresso:espresso-core:3.1.0', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - implementation 'androidx.appcompat:appcompat:1.0.0' - testImplementation junit - - implementation 'androidx.multidex:multidex:2.0.0' -} - -tasks.withType(Test) { - jacoco.includeNoLocationClasses = true - jacoco.excludes = ['jdk.internal.*'] -} - -// createDebugCoverageReport is not available when android.buildTypes.debug.testCoverageEnabled is false -task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) { //, 'createDebugCoverageReport']) { - - reports { - xml.enabled = true - html.enabled = true - } - - getReports().getXml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/merged.xml")) - getReports().getHtml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/html")) - - def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*' - , 'android/**/*.*', "io/realm/*.*"] - def debugTree = fileTree(dir: "${buildDir}/intermediates/javac/debug/classes", excludes: fileFilter) - def mainSrc = "${project.projectDir}/src/main/java" - - sourceDirectories.setFrom(files([mainSrc])) - classDirectories.setFrom(files([debugTree])) - executionData.setFrom(fileTree(dir: project.buildDir, includes: [ - 'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec' - ])) -} \ No newline at end of file diff --git a/wrapper/proguard-rules.pro b/wrapper/proguard-rules.pro deleted file mode 100644 index f0b73f552..000000000 --- a/wrapper/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /opt/android-sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/wrapper/src/main/AndroidManifest.xml b/wrapper/src/main/AndroidManifest.xml deleted file mode 100644 index dee3d654d..000000000 --- a/wrapper/src/main/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wrapper/src/main/java/io/ona/kujaku/wrapper/OfflineMapDownloderActivity.java b/wrapper/src/main/java/io/ona/kujaku/wrapper/OfflineMapDownloderActivity.java deleted file mode 100644 index 9684a11e8..000000000 --- a/wrapper/src/main/java/io/ona/kujaku/wrapper/OfflineMapDownloderActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.ona.kujaku.wrapper; - -import android.os.Bundle; - -import androidx.appcompat.app.AppCompatActivity; - -public class OfflineMapDownloderActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_offline_map_downloder); - } -} diff --git a/wrapper/src/main/res/layout/activity_offline_map_downloder.xml b/wrapper/src/main/res/layout/activity_offline_map_downloder.xml deleted file mode 100644 index c83dd0815..000000000 --- a/wrapper/src/main/res/layout/activity_offline_map_downloder.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/wrapper/src/main/res/mipmap-hdpi/ic_launcher.png b/wrapper/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index cde69bcccec65160d92116f20ffce4fce0b5245c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3418 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 diff --git a/wrapper/src/main/res/mipmap-mdpi/ic_launcher_round.png b/wrapper/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index efc028a636dd690a51db5a525cf781a5a7daba68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2555 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 diff --git a/wrapper/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/wrapper/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 3af2608a4492ef9ae63a77ec3305aedda89594cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6114 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 diff --git a/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7718 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 diff --git a/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/wrapper/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 9bec2e623103ac9713b00cad8502a057c1efda61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10056 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 ek+^GN3bv-?^>(QkVinb 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 - - #3F51B5 - #303F9F - #FF4081 - diff --git a/wrapper/src/main/res/values/strings.xml b/wrapper/src/main/res/values/strings.xml deleted file mode 100644 index 388364a14..000000000 --- a/wrapper/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - Kujaku - diff --git a/wrapper/src/main/res/values/styles.xml b/wrapper/src/main/res/values/styles.xml deleted file mode 100644 index 5885930df..000000000 --- a/wrapper/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/wrapper/src/test/java/io/ona/kujaku/wrapper/ExampleUnitTest.java b/wrapper/src/test/java/io/ona/kujaku/wrapper/ExampleUnitTest.java deleted file mode 100644 index 3956c0603..000000000 --- a/wrapper/src/test/java/io/ona/kujaku/wrapper/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.ona.kujaku.wrapper; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file From f19d418d9bfa089c6bfc2b7296dd468ce4356d04 Mon Sep 17 00:00:00 2001 From: Aurangzaib Umer Date: Mon, 29 Apr 2024 18:13:52 +0500 Subject: [PATCH 02/55] update version number to publish artifact --- utils/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build.gradle b/utils/build.gradle index d701fd76d..7f5e3dab1 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' apply plugin: 'jacoco' -version '0.9.0' +version '0.10.0' project.version = this.version From 7c66e2792a955c450b0817c174a21e7acf97c0e5 Mon Sep 17 00:00:00 2001 From: Aurangzaib Umer Date: Mon, 29 Apr 2024 19:28:06 +0500 Subject: [PATCH 03/55] Revert mapbox sdk key on gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1f1bc68d5..f09f8136d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,7 +31,7 @@ POM_SETTING_DEVELOPER_ID=opensrp POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev android.useAndroidX=true android.enableJetifier=true -#MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiYXVyYW5nemFpYnVtZXIiLCJhIjoiY2x2a3dpazA1MXRhbTJqbnZtNjM0NnB1cCJ9.E1CnQczKA6U7yGtf-mO3Bw +MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiYXVyYW5nemFpYnVtZXIiLCJhIjoiY2x2a3dpazA1MXRhbTJqbnZtNjM0NnB1cCJ9.E1CnQczKA6U7yGtf-mO3Bw android.jetifier.ignorelist=shadows,bcprov-jdk15on #android.jetifier.blacklist=shadows,bcprov-jdk15on From 1f52503f6ef017e4673cfacecfe7c426bca8bdab Mon Sep 17 00:00:00 2001 From: Aurangzaib Umer Date: Mon, 29 Apr 2024 19:28:55 +0500 Subject: [PATCH 04/55] removed unneccessary changes --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f09f8136d..cc3f99f3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,7 +31,6 @@ POM_SETTING_DEVELOPER_ID=opensrp POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev android.useAndroidX=true android.enableJetifier=true -MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiYXVyYW5nemFpYnVtZXIiLCJhIjoiY2x2a3dpazA1MXRhbTJqbnZtNjM0NnB1cCJ9.E1CnQczKA6U7yGtf-mO3Bw android.jetifier.ignorelist=shadows,bcprov-jdk15on #android.jetifier.blacklist=shadows,bcprov-jdk15on From a1a8398219ac57dd75ec718dd3efee3c67e77e16 Mon Sep 17 00:00:00 2001 From: Aurangzaib Umer Date: Mon, 29 Apr 2024 19:30:21 +0500 Subject: [PATCH 05/55] removed developer-config file --- sample/src/main/res/values/developer-config.xml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 sample/src/main/res/values/developer-config.xml diff --git a/sample/src/main/res/values/developer-config.xml b/sample/src/main/res/values/developer-config.xml deleted file mode 100644 index 561ac069a..000000000 --- a/sample/src/main/res/values/developer-config.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - pk.eyJ1IjoiYXVyYW5nemFpYnVtZXIiLCJhIjoiY2xyNjgxMWdyMXNjaTJqbnY5ODhmbWlkcSJ9.SjE_XmUVxLsZDSPlYYvRXQ - \ No newline at end of file From 9307b0d6db4d28639ff252d700f420388839a679 Mon Sep 17 00:00:00 2001 From: Benjamin Mwalimu Date: Wed, 1 May 2024 11:43:44 +0300 Subject: [PATCH 06/55] Update the utils and libs version --- library/build.gradle | 2 +- utils/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index c0788176c..ffc3ca5b8 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'realm-android' apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' -version '0.10.0' +version '0.10.1' project.version = this.version diff --git a/utils/build.gradle b/utils/build.gradle index 7f5e3dab1..445342275 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' apply plugin: 'jacoco' -version '0.10.0' +version '0.10.1' project.version = this.version From 8c2bb76c0f3c5bcea3114d7c6afe40b758764cab Mon Sep 17 00:00:00 2001 From: Benjamin Mwalimu Date: Wed, 1 May 2024 12:31:26 +0300 Subject: [PATCH 07/55] :wrench: Remove unused file --- download-robolectric-deps.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/download-robolectric-deps.sh b/download-robolectric-deps.sh index e5dcd5394..0aa0449cc 100755 --- a/download-robolectric-deps.sh +++ b/download-robolectric-deps.sh @@ -12,5 +12,4 @@ wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/11-robolectr cp robolectric-deps.properties library/src/test/resources cp robolectric-deps.properties utils/src/test/resources -cp robolectric-deps.properties sample/src/test/resources -cp robolectric-deps.properties wrapper/src/test/resources \ No newline at end of file +cp robolectric-deps.properties sample/src/test/resources \ No newline at end of file From 4249ad8427e65241d8debdd1458f4bde507079dd Mon Sep 17 00:00:00 2001 From: Benjamin Mwalimu Date: Fri, 3 May 2024 11:58:24 +0300 Subject: [PATCH 08/55] :arrow_up: Update min sdk version --- library/build.gradle | 2 +- utils/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index ffc3ca5b8..6283aa3ee 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -33,7 +33,7 @@ android { } defaultConfig { - minSdkVersion 16 + minSdkVersion 19 targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName this.version diff --git a/utils/build.gradle b/utils/build.gradle index 445342275..7f06c8e12 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -22,7 +22,7 @@ android { } defaultConfig { - minSdkVersion 16 + minSdkVersion 19 targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName this.version From 47f2adb5995e45e009c83b06394a4e51849b9686 Mon Sep 17 00:00:00 2001 From: Benjamin Mwalimu Date: Wed, 8 May 2024 11:11:20 +0300 Subject: [PATCH 09/55] :arrow_up: Update the Kujaku dependencies --- library/build.gradle | 2 +- utils/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 6283aa3ee..54bcf578c 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'realm-android' apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' -version '0.10.1' +version '0.10.1-SNAPSHOT' project.version = this.version diff --git a/utils/build.gradle b/utils/build.gradle index 7f06c8e12..56229ad48 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' apply plugin: 'jacoco' -version '0.10.1' +version '0.10.1-SNAPSHOT' project.version = this.version From b5e3693e3c9b3d3a706462ac46a6ca7c4c1379c3 Mon Sep 17 00:00:00 2001 From: Benjamin Mwalimu Date: Fri, 10 May 2024 00:36:11 +0300 Subject: [PATCH 10/55] :arrow_up: Upgrade the kujaku dependencies and publish snapshots --- build.gradle | 2 ++ library/build.gradle | 5 +++-- utils/build.gradle | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9000cc0b5..c0435a5b2 100644 --- a/build.gradle +++ b/build.gradle @@ -46,6 +46,8 @@ allprojects { password = localProperties['mapbox.repo.token'] ?: "" } } + maven{url "https://oss.sonatype.org/content/repositories/snapshots"} + maven{url "https://s01.oss.sonatype.org/content/repositories/snapshots"} } } diff --git a/library/build.gradle b/library/build.gradle index 54bcf578c..f2a0d36c4 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'jacoco' buildscript { repositories { + mavenCentral() jcenter() } dependencies { @@ -14,7 +15,7 @@ apply plugin: 'realm-android' apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' -version '0.10.1-SNAPSHOT' +version '0.10.2-SNAPSHOT' project.version = this.version @@ -118,7 +119,7 @@ dependencies { configuration -> // Comment the line below when creating releases - The line is for development of the library & utils implementation (project(":utils")) { // Uncomment the line below when creating releases - //implementation('io.ona.kujaku:utils:0.9.0') { + //implementation('io.ona.kujaku:utils:0.10.2-SNAPSHOT') { transitive = true; exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-sdk' exclude group: 'com.android.support', module: 'support-v4' diff --git a/utils/build.gradle b/utils/build.gradle index 56229ad48..09133443b 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' apply plugin: 'jacoco' -version '0.10.1-SNAPSHOT' +version '0.10.2-SNAPSHOT' project.version = this.version From 1610f052d73d62cd196f8aa51582cf2237b9343d Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Mon, 1 Jul 2024 18:25:22 +0300 Subject: [PATCH 11/55] Update library.yml to JDK 17 --- .github/workflows/library.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/library.yml b/.github/workflows/library.yml index cb2b58620..79cf08562 100644 --- a/.github/workflows/library.yml +++ b/.github/workflows/library.yml @@ -29,10 +29,10 @@ jobs: with: fetch-depth: 2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Create local.properties file run: touch local.properties && echo "mapbox.repo.token=${{ secrets.MAPBOX_SDK_REPO_TOKEN }}" >> local.properties @@ -73,4 +73,4 @@ jobs: - name: Github Release uses: softprops/action-gh-release@v1 with: - prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }} \ No newline at end of file + prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }} From fe6cbe04cdd3cf869fb5e8e734d925a316d91612 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Mon, 1 Jul 2024 18:26:47 +0300 Subject: [PATCH 12/55] Update ci.yml to JDK 17 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2529f03cf..514706caf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Create local.properties file run: touch local.properties && echo "mapbox.repo.token=${{ secrets.MAPBOX_SDK_REPO_TOKEN }}" >> local.properties - name: Print Java version @@ -46,4 +46,4 @@ jobs: - name: Merge jacoco reports from all modules run: ./gradlew jacocoFullReport --stacktrace - name: Upload coverage to Coveralls with Gradle - run: ./gradlew coveralls --stacktrace \ No newline at end of file + run: ./gradlew coveralls --stacktrace From 0bb698ac66ce1cd4240ac3c65377f9d035a100ea Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Mon, 1 Jul 2024 18:27:24 +0300 Subject: [PATCH 13/55] Update utils.yml to JDK 17 --- .github/workflows/utils.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/utils.yml b/.github/workflows/utils.yml index e4d1a0f49..5bbcf8469 100644 --- a/.github/workflows/utils.yml +++ b/.github/workflows/utils.yml @@ -29,10 +29,10 @@ jobs: with: fetch-depth: 2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Create local.properties file run: touch local.properties && echo "mapbox.repo.token=${{ secrets.MAPBOX_SDK_REPO_TOKEN }}" >> local.properties @@ -70,4 +70,4 @@ jobs: - name: Github Release uses: softprops/action-gh-release@v1 with: - prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }} \ No newline at end of file + prerelease: ${{ contains(github.ref, '-alpha') || contains(github.ref, '-beta') }} From 2547c2aa10ebc4c47a4de9806ae93f841e9fc7ed Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Tue, 2 Jul 2024 09:12:52 +0300 Subject: [PATCH 14/55] Pin CI workflow Runner to MacOS 13 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 514706caf..226753e6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v2 From 28edb1d5eb49dc600ca49682376ca2df145da8a6 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Tue, 2 Jul 2024 11:03:59 +0300 Subject: [PATCH 15/55] Upgrade Robolectric Version Upgrade CompileSDK Version Add Maven Central to set of source repositories --- build.gradle | 1 + configs.gradle | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index c0435a5b2..7457e1ccb 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ allprojects { repositories { google() jcenter() + mavenCentral() mavenLocal() maven { url "https://jitpack.io" } maven { diff --git a/configs.gradle b/configs.gradle index d76b42003..3d1020238 100644 --- a/configs.gradle +++ b/configs.gradle @@ -105,13 +105,13 @@ ext { // Dependency and other versions androidxTestCoreVersion = "1.4.0" buildToolsVersion = "30.0.3" - compileSdkVersion = 28 + compileSdkVersion = 30 jacocoVersion = "0.8.8" junitVersion = "4.12" mapboxAnnotationPluginVersion = "0.9.0" mapboxSdkVersion = "9.7.1" - robolectricShadowsMultidexVersion = "4.3.1" - robolectricVersion = "4.3.1" + robolectricShadowsMultidexVersion = "4.7.3" + robolectricVersion = "4.7.3" supportVersion = "1.0.0" volleyVersion = "1.2.0" targetSdkVersion = 27 From 91b5ed7aaaeeb7e2924b1fbebb78dd8c889b765c Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Tue, 2 Jul 2024 17:13:42 +0300 Subject: [PATCH 16/55] Add missing Robolectric Artifact --- download-robolectric-deps.sh | 1 + robolectric-deps.properties | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/download-robolectric-deps.sh b/download-robolectric-deps.sh index 0aa0449cc..a484014d7 100755 --- a/download-robolectric-deps.sh +++ b/download-robolectric-deps.sh @@ -2,6 +2,7 @@ mkdir robolectric-deps wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/10-robolectric-5803371/android-all-10-robolectric-5803371.jar -P robolectric-deps wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/8.1.0-robolectric-4611349/android-all-8.1.0-robolectric-4611349.jar -P robolectric-deps +wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all-instrumented/8.1.0-robolectric-4611349-i3/android-all-instrumented-8.1.0-robolectric-4611349-i3.jar -P robolectric-deps wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/8.0.0_r4-robolectric-r1/android-all-8.0.0_r4-robolectric-r1.jar -P robolectric-deps wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/6.0.1_r3-robolectric-r1/android-all-6.0.1_r3-robolectric-r1.jar -P robolectric-deps diff --git a/robolectric-deps.properties b/robolectric-deps.properties index 43437be27..7d9781e1b 100644 --- a/robolectric-deps.properties +++ b/robolectric-deps.properties @@ -3,6 +3,11 @@ org.robolectric\:android-all\:7.0.0_r1-robolectric-r1=../../../../../../robolect org.robolectric\:android-all\:7.1.0_r7-robolectric-r1=../../../../../../robolectric-deps/android-all-7.1.0_r7-robolectric-r1.jar org.robolectric\:android-all\:8.0.0_r4-robolectric-r1=../../../../../../robolectric-deps/android-all-8.0.0_r4-robolectric-r1.jar org.robolectric\:android-all\:8.1.0-robolectric-4611349=../../../../../../robolectric-deps/android-all-8.1.0-robolectric-4611349.jar +org.robolectric\:android-all-instrumented\:8.1.0-robolectric-4611349=../../../../../../robolectric-deps/android-all-instrumented-8.1.0-robolectric-4611349.jar +org.robolectric\:android-all-instrumented\:8.0.0_r4-robolectric-r1-i3=../../../../../../robolectric-deps/android-all-instrumented-8.0.0_r4-robolectric-r1-i3.jar +org.robolectric\:android-all-instrumented\:7.1.0_r7-robolectric-r1-i3=../../../../../../robolectric-deps/android-all-instrumented-7.1.0_r7-robolectric-r1-i3.jar +org.robolectric\:android-all-instrumented\:8.1.0-robolectric-4611349-i3=../../../../../../robolectric-deps/android-all-instrumented-8.1.0-robolectric-4611349-i3.jar +org.robolectric\:android-all-instrumented\:12-robolectric-7732740-i3=../../../../../../robolectric-deps/android-all-instrumented-12-robolectric-7732740-i3.jar org.robolectric\:android-all\:9-robolectric-4913185-2=../../../../../../robolectric-deps/android-all-9-robolectric-4913185-2.jar org.robolectric\:android-all\:10-robolectric-5803371=../../../../../../robolectric-deps/android-all-10-robolectric-5803371.jar org.robolectric\:android-all\:11-robolectric-6757853=../../../../../../robolectric-deps/android-all-11-robolectric-6757853.jar \ No newline at end of file From e55c20d2591a1e24bf24d0d5bde0910fc6ac2632 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Wed, 3 Jul 2024 13:20:13 +0300 Subject: [PATCH 17/55] Run tests on API 30 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 226753e6c..aca4eb515 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - name: Run Instrumented Tests manually uses: reactivecircus/android-emulator-runner@v2 with: - api-level: 22 + api-level: 30 script: ./gradlew connectedDebug --stacktrace --info - name: Run jacocoTestReport for each module run: ./gradlew jacocoTestReport --stacktrace --info From 1e6049ee0bf2b59152fd3602cc7e8515d2f99288 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Wed, 3 Jul 2024 14:29:07 +0300 Subject: [PATCH 18/55] Update Run Instrumented Tests workflow configuration --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aca4eb515..184519e93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,8 +38,13 @@ jobs: run: ./gradlew build -x test --stacktrace - name: Run Instrumented Tests manually uses: reactivecircus/android-emulator-runner@v2 - with: - api-level: 30 + with: + working-directory: android + api-level: 22 + arch: x86_64 + force-avd-creation: true + emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + disable-animations: true script: ./gradlew connectedDebug --stacktrace --info - name: Run jacocoTestReport for each module run: ./gradlew jacocoTestReport --stacktrace --info From 5302bc64491aeef4ed8e970e8d43fdcdc4a01473 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Wed, 3 Jul 2024 15:57:25 +0300 Subject: [PATCH 19/55] Update Run Instrumented Tests workflow configuration --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 184519e93..2f7844726 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,8 +38,7 @@ jobs: run: ./gradlew build -x test --stacktrace - name: Run Instrumented Tests manually uses: reactivecircus/android-emulator-runner@v2 - with: - working-directory: android + with: api-level: 22 arch: x86_64 force-avd-creation: true From 388f94eb2657126271ca46fa160ee70c1269c0f7 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Thu, 25 Jul 2024 16:20:42 +0300 Subject: [PATCH 20/55] Troubleshooting | Clean up --- .github/workflows/ci.yml | 2 -- download-robolectric-deps.sh | 16 ---------------- robolectric-deps.properties | 13 ------------- 3 files changed, 31 deletions(-) delete mode 100755 download-robolectric-deps.sh delete mode 100644 robolectric-deps.properties diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f7844726..30dac679e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,8 +30,6 @@ jobs: run: chmod +x gradlew - name: Git show commit count run: git fetch origin master && git rev-list --first-parent --count origin/master - - name: Download Robolectric deps - run: chmod +x download-robolectric-deps.sh && ./download-robolectric-deps.sh - name: Clean project run: ./gradlew clean --stacktrace - name: Build project skipping tests diff --git a/download-robolectric-deps.sh b/download-robolectric-deps.sh deleted file mode 100755 index a484014d7..000000000 --- a/download-robolectric-deps.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -mkdir robolectric-deps -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/10-robolectric-5803371/android-all-10-robolectric-5803371.jar -P robolectric-deps -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/8.1.0-robolectric-4611349/android-all-8.1.0-robolectric-4611349.jar -P robolectric-deps -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all-instrumented/8.1.0-robolectric-4611349-i3/android-all-instrumented-8.1.0-robolectric-4611349-i3.jar -P robolectric-deps -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/8.0.0_r4-robolectric-r1/android-all-8.0.0_r4-robolectric-r1.jar -P robolectric-deps - -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/6.0.1_r3-robolectric-r1/android-all-6.0.1_r3-robolectric-r1.jar -P robolectric-deps -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/7.0.0_r1-robolectric-r1/android-all-7.0.0_r1-robolectric-r1.jar -P robolectric-deps -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/7.1.0_r7-robolectric-r1/android-all-7.1.0_r7-robolectric-r1.jar -P robolectric-deps -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/9-robolectric-4913185-2/android-all-9-robolectric-4913185-2.jar -P robolectric-deps -wget -nc https://repo1.maven.org/maven2/org/robolectric/android-all/11-robolectric-6757853/android-all-11-robolectric-6757853.jar -P robolectric-deps - -cp robolectric-deps.properties library/src/test/resources -cp robolectric-deps.properties utils/src/test/resources -cp robolectric-deps.properties sample/src/test/resources \ No newline at end of file diff --git a/robolectric-deps.properties b/robolectric-deps.properties deleted file mode 100644 index 7d9781e1b..000000000 --- a/robolectric-deps.properties +++ /dev/null @@ -1,13 +0,0 @@ -org.robolectric\:android-all\:6.0.1_r3-robolectric-r1=../../../../../../robolectric-deps/android-all-6.0.1_r3-robolectric-r1.jar -org.robolectric\:android-all\:7.0.0_r1-robolectric-r1=../../../../../../robolectric-deps/android-all-7.0.0_r1-robolectric-r1.jar -org.robolectric\:android-all\:7.1.0_r7-robolectric-r1=../../../../../../robolectric-deps/android-all-7.1.0_r7-robolectric-r1.jar -org.robolectric\:android-all\:8.0.0_r4-robolectric-r1=../../../../../../robolectric-deps/android-all-8.0.0_r4-robolectric-r1.jar -org.robolectric\:android-all\:8.1.0-robolectric-4611349=../../../../../../robolectric-deps/android-all-8.1.0-robolectric-4611349.jar -org.robolectric\:android-all-instrumented\:8.1.0-robolectric-4611349=../../../../../../robolectric-deps/android-all-instrumented-8.1.0-robolectric-4611349.jar -org.robolectric\:android-all-instrumented\:8.0.0_r4-robolectric-r1-i3=../../../../../../robolectric-deps/android-all-instrumented-8.0.0_r4-robolectric-r1-i3.jar -org.robolectric\:android-all-instrumented\:7.1.0_r7-robolectric-r1-i3=../../../../../../robolectric-deps/android-all-instrumented-7.1.0_r7-robolectric-r1-i3.jar -org.robolectric\:android-all-instrumented\:8.1.0-robolectric-4611349-i3=../../../../../../robolectric-deps/android-all-instrumented-8.1.0-robolectric-4611349-i3.jar -org.robolectric\:android-all-instrumented\:12-robolectric-7732740-i3=../../../../../../robolectric-deps/android-all-instrumented-12-robolectric-7732740-i3.jar -org.robolectric\:android-all\:9-robolectric-4913185-2=../../../../../../robolectric-deps/android-all-9-robolectric-4913185-2.jar -org.robolectric\:android-all\:10-robolectric-5803371=../../../../../../robolectric-deps/android-all-10-robolectric-5803371.jar -org.robolectric\:android-all\:11-robolectric-6757853=../../../../../../robolectric-deps/android-all-11-robolectric-6757853.jar \ No newline at end of file From 763a74d579ab0d5b682872154cdc133ad3decb21 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Thu, 25 Jul 2024 18:15:41 +0300 Subject: [PATCH 21/55] Migrate to API 13 (Android 12) Upgrade test dependencies --- configs.gradle | 13 ++++++------- gradle.properties | 2 +- library/build.gradle | 12 +++++++----- library/src/main/AndroidManifest.xml | 3 ++- sample/build.gradle | 3 +-- sample/src/main/AndroidManifest.xml | 5 +++-- utils/build.gradle | 3 +-- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/configs.gradle b/configs.gradle index 3d1020238..e5fe9db7d 100644 --- a/configs.gradle +++ b/configs.gradle @@ -104,17 +104,16 @@ ext { // Dependency and other versions androidxTestCoreVersion = "1.4.0" - buildToolsVersion = "30.0.3" - compileSdkVersion = 30 - jacocoVersion = "0.8.8" - junitVersion = "4.12" + compileSdkVersion = 34 + jacocoVersion = "0.8.11" + junitVersion = "4.13.2" mapboxAnnotationPluginVersion = "0.9.0" mapboxSdkVersion = "9.7.1" - robolectricShadowsMultidexVersion = "4.7.3" - robolectricVersion = "4.7.3" + robolectricShadowsMultidexVersion = "4.13" + robolectricVersion = "4.13" supportVersion = "1.0.0" volleyVersion = "1.2.0" - targetSdkVersion = 27 + targetSdkVersion = 34 // Dependency names androidxTestCore = "androidx.test:core:$androidxTestCoreVersion" diff --git a/gradle.properties b/gradle.properties index cc3f99f3d..1dc978101 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev android.useAndroidX=true android.enableJetifier=true -android.jetifier.ignorelist=shadows,bcprov-jdk15on +android.jetifier.ignorelist=shadows,bcprov-jdk18on #android.jetifier.blacklist=shadows,bcprov-jdk15on # android.debug.obsoleteApi=true diff --git a/library/build.gradle b/library/build.gradle index f2a0d36c4..7e1d8cfeb 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -25,8 +25,7 @@ jacoco { android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion + compileSdk rootProject.ext.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -146,12 +145,15 @@ private static void testDependencies(instance, configuration) { configuration.testImplementation instance.robolectric configuration.testImplementation instance.robolectricShadowsMultidex - configuration.testImplementation 'org.mockito:mockito-inline:2.25.0' + configuration.testImplementation 'org.mockito:mockito-inline:5.2.0' configuration.testImplementation instance.androidxTestCore configuration.androidTestImplementation instance.junit - configuration.androidTestImplementation 'org.mockito:mockito-android:2.7.22' - configuration.androidTestImplementation 'org.mockito:mockito-core:2.7.22' + + def mockitoVersion = '5.12.0' + + configuration.androidTestImplementation "org.mockito:mockito-android:$mockitoVersion" + configuration.androidTestImplementation "org.mockito:mockito-core:$mockitoVersion" configuration.androidTestImplementation ('com.android.support.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'net.sf.kxml', module: 'kxml2' diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 022be0261..e21ec3d3a 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ package="io.ona.kujaku"> + @@ -24,7 +25,7 @@ - + diff --git a/sample/build.gradle b/sample/build.gradle index 784254475..5af0e0fb0 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -8,8 +8,7 @@ jacoco { android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion + compileSdk rootProject.ext.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 9908013bf..e27a988b5 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -20,7 +20,8 @@ + android:windowSoftInputMode="stateAlwaysHidden" + android:exported="true"> @@ -108,4 +109,4 @@ - \ No newline at end of file + diff --git a/utils/build.gradle b/utils/build.gradle index 09133443b..16c93726f 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -13,8 +13,7 @@ jacoco { android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion + compileSdk rootProject.ext.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 From 3b82ab114f9747539e69631f4c4350a33d00caa6 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Fri, 26 Jul 2024 11:17:45 +0300 Subject: [PATCH 22/55] =?UTF-8?q?Fix=20build=20=F0=9F=92=9A=20-=20Migrate?= =?UTF-8?q?=20from=20AsyncTasks=20-=20Test=20Dependencies=20updates=20-=20?= =?UTF-8?q?Refactor=20unit=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../helpers/ActivityLauncherHelper.java | 5 +- .../io/ona/kujaku/layers/ArrowLineLayer.java | 4 +- .../io/ona/kujaku/layers/BoundaryLayer.java | 4 +- .../notifications/KujakuNotification.java | 14 +++++- .../services/WmtsCapabilitiesService.java | 2 +- .../io/ona/kujaku/tasks/GenericAsyncTask.java | 47 ++++++++++--------- .../ona/kujaku/library/KujakuLibraryTest.java | 34 ++++++++------ .../notifications/BaseNotificationTest.java | 6 +-- .../notifications/KujakuNotificationTest.java | 42 +++++++---------- .../kujaku/services/TrackingServiceTest.java | 9 ++-- .../activities/CGRIntegrationActivity.java | 2 +- .../sample/activities/MainActivity.java | 4 +- utils/build.gradle | 1 + .../helpers/converters/GeoJSONHelperTest.java | 9 ++-- 14 files changed, 95 insertions(+), 88 deletions(-) diff --git a/library/src/main/java/io/ona/kujaku/helpers/ActivityLauncherHelper.java b/library/src/main/java/io/ona/kujaku/helpers/ActivityLauncherHelper.java index b5866fa80..b31c96f2a 100644 --- a/library/src/main/java/io/ona/kujaku/helpers/ActivityLauncherHelper.java +++ b/library/src/main/java/io/ona/kujaku/helpers/ActivityLauncherHelper.java @@ -20,6 +20,7 @@ import io.ona.kujaku.listeners.OnFinishedListener; import io.ona.kujaku.tasks.GenericAsyncTask; import io.ona.kujaku.utils.Constants; +import timber.log.Timber; import static io.ona.kujaku.utils.Constants.ENABLE_DROP_POINT_BUTTON; import static io.ona.kujaku.utils.Constants.MAP_ACTIVITY_REQUEST_CODE; @@ -54,7 +55,7 @@ public void onSuccess(Object[] objects) { } @Override public void onError(Exception e) { - Log.e(TAG, Log.getStackTraceString(e)); + Timber.tag(TAG).e(Log.getStackTraceString(e)); } }); } @@ -76,6 +77,6 @@ public Object[] call() throws Exception { } }); genericAsyncTask.setOnFinishedListener(onFinishedListener); - genericAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + genericAsyncTask.execute(); } } diff --git a/library/src/main/java/io/ona/kujaku/layers/ArrowLineLayer.java b/library/src/main/java/io/ona/kujaku/layers/ArrowLineLayer.java index ce529d9d3..47b3b4077 100644 --- a/library/src/main/java/io/ona/kujaku/layers/ArrowLineLayer.java +++ b/library/src/main/java/io/ona/kujaku/layers/ArrowLineLayer.java @@ -291,7 +291,7 @@ public void onError(Exception e) { } }); - genericAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + genericAsyncTask.execute(); } @Override @@ -402,7 +402,7 @@ public void onError(Exception e) { } }); - genericAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + genericAsyncTask.execute(); } } diff --git a/library/src/main/java/io/ona/kujaku/layers/BoundaryLayer.java b/library/src/main/java/io/ona/kujaku/layers/BoundaryLayer.java index feb1611fa..de1ce8605 100644 --- a/library/src/main/java/io/ona/kujaku/layers/BoundaryLayer.java +++ b/library/src/main/java/io/ona/kujaku/layers/BoundaryLayer.java @@ -154,7 +154,7 @@ public void onError(Exception e) { } }); - genericAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + genericAsyncTask.execute(); } protected void createLayers(@NonNull MapboxMap mapboxMap) { @@ -321,7 +321,7 @@ public void onError(Exception e) { } }); - genericAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + genericAsyncTask.execute(); } } diff --git a/library/src/main/java/io/ona/kujaku/notifications/KujakuNotification.java b/library/src/main/java/io/ona/kujaku/notifications/KujakuNotification.java index 1d824bae4..ce0d102e6 100644 --- a/library/src/main/java/io/ona/kujaku/notifications/KujakuNotification.java +++ b/library/src/main/java/io/ona/kujaku/notifications/KujakuNotification.java @@ -9,13 +9,15 @@ import androidx.annotation.RequiresApi; import androidx.core.app.NotificationCompat; +import timber.log.Timber; + /** * Created by Ephraim Kigamba - ekigamba@ona.io on 11/01/2018. */ abstract class KujakuNotification { - protected NotificationChannel notificationChannel; + private NotificationChannel notificationChannel; public static final int NO_LED_COLOR = 0; private int smallIcon; protected Context context; @@ -93,7 +95,15 @@ public NotificationCompat.Builder createNotification(String title, @Nullable Str } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - builder.setChannelId(notificationChannel.getId()); + + try { + + builder.setChannelId(notificationChannel.getId()); + + } catch (NullPointerException e) { + Timber.e(e); + } + } return builder; diff --git a/library/src/main/java/io/ona/kujaku/services/WmtsCapabilitiesService.java b/library/src/main/java/io/ona/kujaku/services/WmtsCapabilitiesService.java index c283af37e..39c30ee76 100644 --- a/library/src/main/java/io/ona/kujaku/services/WmtsCapabilitiesService.java +++ b/library/src/main/java/io/ona/kujaku/services/WmtsCapabilitiesService.java @@ -87,6 +87,6 @@ public void onError(Exception e) { } }); - task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + task.execute(); } } diff --git a/library/src/main/java/io/ona/kujaku/tasks/GenericAsyncTask.java b/library/src/main/java/io/ona/kujaku/tasks/GenericAsyncTask.java index 42676ba4e..a6d92358f 100644 --- a/library/src/main/java/io/ona/kujaku/tasks/GenericAsyncTask.java +++ b/library/src/main/java/io/ona/kujaku/tasks/GenericAsyncTask.java @@ -1,51 +1,52 @@ package io.ona.kujaku.tasks; -import android.os.AsyncTask; import androidx.annotation.NonNull; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + import io.ona.kujaku.callables.AsyncTaskCallable; import io.ona.kujaku.exceptions.AsyncTaskCancelledException; import io.ona.kujaku.listeners.OnFinishedListener; import io.ona.kujaku.utils.LogUtil; -/** - * Created by Ephraim Kigamba - ekigamba@ona.io on 03/10/2018 - */ - -public class GenericAsyncTask extends AsyncTask { - +public class GenericAsyncTask { private static final String TAG = GenericAsyncTask.class.getName(); - private AsyncTaskCallable toCall; + private final AsyncTaskCallable toCall; private OnFinishedListener onFinishedListener; - private Exception exception; + private ExecutorService executorService; public GenericAsyncTask(@NonNull AsyncTaskCallable toCall) { this.toCall = toCall; } - @Override - protected Object[] doInBackground(Void... voids) { + public void execute() { + try { - return toCall.call(); + + executorService = Executors.newSingleThreadExecutor(); + + Future result = executorService.submit(toCall); + + if (onFinishedListener != null) { + onFinishedListener.onSuccess(result.get()); + } + } catch (Exception e) { LogUtil.e(TAG, e); - exception = e; - this.cancel(true); + cancel(e); - return null; - } - } + } finally { - @Override - protected void onPostExecute(Object[] objects) { - if (onFinishedListener != null) { - onFinishedListener.onSuccess(objects); + if (executorService != null) + executorService.shutdownNow(); } + } - @Override - protected void onCancelled() { + protected void cancel(Exception exception) { if (onFinishedListener != null) { Exception cancelException = exception == null ? new AsyncTaskCancelledException() : diff --git a/library/src/test/java/io/ona/kujaku/library/KujakuLibraryTest.java b/library/src/test/java/io/ona/kujaku/library/KujakuLibraryTest.java index f8d62a88c..69d688db6 100644 --- a/library/src/test/java/io/ona/kujaku/library/KujakuLibraryTest.java +++ b/library/src/test/java/io/ona/kujaku/library/KujakuLibraryTest.java @@ -1,11 +1,16 @@ package io.ona.kujaku.library; +import static junit.framework.Assert.assertEquals; + import android.app.Activity; import android.app.Application; import android.content.Intent; +import androidx.test.core.app.ApplicationProvider; + import com.mapbox.mapboxsdk.Mapbox; +import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -15,6 +20,7 @@ import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; +import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import java.util.ArrayList; @@ -24,12 +30,6 @@ import io.ona.kujaku.helpers.ActivityLauncherHelper; import io.ona.kujaku.test.shadows.ShadowConnectivityReceiver; -import static junit.framework.Assert.assertEquals; -import androidx.test.core.app.ApplicationProvider; - -/** - * @author Vincent Karuri - */ @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE , application = TestApplication.class, @@ -40,23 +40,29 @@ public class KujakuLibraryTest { public MockitoRule rule = MockitoJUnit.rule(); private Activity activity; + private ActivityController activityController; @Before public void setupBeforeTest() { Mapbox.getInstance(ApplicationProvider.getApplicationContext(), "some-access-token"); - activity = Robolectric.buildActivity(Activity.class).create().get(); + activityController = Robolectric.buildActivity(Activity.class); + activity = activityController.create().get(); + } + + @After + public void tearDown() { + activityController.close(); } @Test - public void testMethodLaunchMapActivityShouldSuccessfullyLaunchMapActivity() throws InterruptedException { - ActivityLauncherHelper.launchMapActivity(activity, Mapbox.getAccessToken(), new ArrayList<>(), true); - Thread.sleep(5000L); + public void testMethodLaunchMapActivityShouldSuccessfullyLaunchMapActivity() { + ActivityLauncherHelper.launchMapActivity(activity, Mapbox.getAccessToken(), new ArrayList<>(), true); - Robolectric.getForegroundThreadScheduler().runOneTask(); // flush foreground job to allow AsyncTask's onPostExecute to run + Robolectric.flushForegroundThreadScheduler(); // flush foreground job to allow AsyncTask's onPostExecute to run - Intent expectedIntent = new Intent(activity, MapActivity.class); + Intent expectedIntent = new Intent(activity, MapActivity.class); - Intent actualIntent = Shadows.shadowOf((Application) ApplicationProvider.getApplicationContext()).getNextStartedActivity(); - assertEquals(expectedIntent.getComponent(), actualIntent.getComponent()); + Intent actualIntent = Shadows.shadowOf((Application) ApplicationProvider.getApplicationContext()).getNextStartedActivity(); + assertEquals(expectedIntent.getComponent(), actualIntent.getComponent()); } } diff --git a/library/src/test/java/io/ona/kujaku/notifications/BaseNotificationTest.java b/library/src/test/java/io/ona/kujaku/notifications/BaseNotificationTest.java index 917729b8f..4fffb879b 100644 --- a/library/src/test/java/io/ona/kujaku/notifications/BaseNotificationTest.java +++ b/library/src/test/java/io/ona/kujaku/notifications/BaseNotificationTest.java @@ -31,7 +31,7 @@ * Created by Ephraim Kigamba - ekigamba@ona.io on 16/01/2018. */ @RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.O) +@Config(manifest = Config.NONE) public abstract class BaseNotificationTest extends BaseTest { protected Context context; @@ -90,10 +90,6 @@ protected String getNotificationProgressContent(double percentageProgress) { return String.format(context.getString(R.string.notification_download_progress_content), DownloadProgressNotification.formatDecimal(percentageProgress)); } - protected void setSDKToAndroidOreo() throws NoSuchFieldException, IllegalAccessException { - setFinalStatic(Build.VERSION.class.getField("SDK_INT"), Build.VERSION_CODES.O); - } - @After public void tearDown() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { diff --git a/library/src/test/java/io/ona/kujaku/notifications/KujakuNotificationTest.java b/library/src/test/java/io/ona/kujaku/notifications/KujakuNotificationTest.java index 6e78da659..526ce77e9 100644 --- a/library/src/test/java/io/ona/kujaku/notifications/KujakuNotificationTest.java +++ b/library/src/test/java/io/ona/kujaku/notifications/KujakuNotificationTest.java @@ -5,9 +5,11 @@ import android.content.Context; import android.graphics.Color; import android.os.Build; + import androidx.annotation.RequiresApi; import androidx.core.app.NotificationCompat; +import org.junit.Ignore; import org.junit.Test; import org.robolectric.annotation.Config; @@ -15,14 +17,13 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -/** - * Created by Ephraim Kigamba - ekigamba@ona.io on 17/01/2018. - */ public class KujakuNotificationTest extends BaseNotificationTest { - @Config(sdk = 26) @Test public void createNotificationShouldCreateValidNotificationBuilderWithTextAndChannelIdWhenGivenContent() throws NoSuchFieldException, IllegalAccessException { KujakuNotificationImplClass kujakuNotification = new KujakuNotificationImplClass(); @@ -31,7 +32,6 @@ public void createNotificationShouldCreateValidNotificationBuilderWithTextAndCha String content = "This is some sample content"; // Create the notification channel - setSDKToAndroidOreo(); kujakuNotification.setContext(context); kujakuNotification.createNotificationChannel(NotificationManager.IMPORTANCE_DEFAULT, "sample channel name", channelId); @@ -41,9 +41,8 @@ public void createNotificationShouldCreateValidNotificationBuilderWithTextAndCha assertEquals(channelId, getValueInPrivateField(NotificationCompat.Builder.class, builder, "mChannelId")); } - @Config(sdk = 25) @Test - public void createNotificationShouldCreateValidNotifcationBuilderWithTextOnly() throws NoSuchFieldException, IllegalAccessException { + public void createNotificationShouldCreateValidNotificationBuilderWithTextOnly() throws NoSuchFieldException, IllegalAccessException { KujakuNotificationImplClass kujakuNotification = new KujakuNotificationImplClass(); String title = "sample tiTle 4"; String content = "This is some sample content for the notification"; @@ -51,18 +50,15 @@ public void createNotificationShouldCreateValidNotifcationBuilderWithTextOnly() NotificationCompat.Builder builder = kujakuNotification.createNotification(title, content); assertNotificationBuilder(builder, title, content, null); - assertEquals(null, getValueInPrivateField(NotificationCompat.Builder.class, builder, "mChannelId")); + assertNull(getValueInPrivateField(NotificationCompat.Builder.class, builder, "mChannelId")); } - @Config(sdk = 26) @Test public void createNotificationShouldCreateValidNotificationBuilderWithChannelIdOnly() throws NoSuchFieldException, IllegalAccessException { KujakuNotificationImplClass kujakuNotification = new KujakuNotificationImplClass(); String title = "sample tiTle 4"; String channelId = UUID.randomUUID().toString(); - // Create the notification channel - setSDKToAndroidOreo(); kujakuNotification.setContext(context); kujakuNotification.createNotificationChannel(NotificationManager.IMPORTANCE_DEFAULT, "sample channel name", channelId); @@ -72,7 +68,6 @@ public void createNotificationShouldCreateValidNotificationBuilderWithChannelIdO assertEquals(channelId, getValueInPrivateField(NotificationCompat.Builder.class, builder, "mChannelId")); } - @Config(sdk = 25) @Test public void createNotificationShouldCreateValidNotificationBuilderWithoutTextOrChannelId() throws NoSuchFieldException, IllegalAccessException { KujakuNotificationImplClass kujakuNotification = new KujakuNotificationImplClass(); @@ -81,10 +76,9 @@ public void createNotificationShouldCreateValidNotificationBuilderWithoutTextOrC NotificationCompat.Builder builder = kujakuNotification.createNotification(title); assertNotificationBuilder(builder, title, null, null); - assertEquals(null, getValueInPrivateField(NotificationCompat.Builder.class, builder, "mChannelId")); + assertNull(getValueInPrivateField(NotificationCompat.Builder.class, builder, "mChannelId")); } - @RequiresApi(Build.VERSION_CODES.O) @Test public void createNotificationChannelShouldCreateValidNotificationChannel() { KujakuNotificationImplClass kujakuNotificationImplClass = new KujakuNotificationImplClass(); @@ -95,6 +89,7 @@ public void createNotificationChannelShouldCreateValidNotificationChannel() { int ledColor = Color.RED; long[] vibrationPattern = new long[]{200, 700, 200, 700}; kujakuNotificationImplClass.createNotificationChannel(NotificationManager.IMPORTANCE_HIGH, channelName, channelId, channelDescription, ledColor, vibrationPattern); + assertNotNull(kujakuNotificationImplClass.getNotificationChannel()); channelIdsAdded.add(channelId); @@ -104,13 +99,12 @@ public void createNotificationChannelShouldCreateValidNotificationChannel() { assertNotNull(notificationChannel); assertEquals(channelName, notificationChannel.getName()); assertEquals(channelDescription, notificationChannel.getDescription()); - assertEquals(true, notificationChannel.shouldVibrate()); - assertEquals(true, notificationChannel.shouldShowLights()); + assertTrue(notificationChannel.shouldVibrate()); + assertTrue(notificationChannel.shouldShowLights()); assertArrayEquals(vibrationPattern, notificationChannel.getVibrationPattern()); assertEquals(ledColor, notificationChannel.getLightColor()); } - @RequiresApi(Build.VERSION_CODES.O) @Test public void createNotificationChannelShouldCreateValidNotificationChannelWithoutLights() { KujakuNotificationImplClass kujakuNotificationImplClass = new KujakuNotificationImplClass(); @@ -129,12 +123,11 @@ public void createNotificationChannelShouldCreateValidNotificationChannelWithout assertNotNull(notificationChannel); assertEquals(channelName, notificationChannel.getName()); assertEquals(channelDescription, notificationChannel.getDescription()); - assertEquals(true, notificationChannel.shouldVibrate()); - assertEquals(false, notificationChannel.shouldShowLights()); + assertTrue(notificationChannel.shouldVibrate()); + assertFalse(notificationChannel.shouldShowLights()); assertArrayEquals(vibrationPattern, notificationChannel.getVibrationPattern()); } - @RequiresApi(Build.VERSION_CODES.O) @Test public void createNotificationChannelShouldCreateValidNotificationChannelWithoutVibration() { KujakuNotificationImplClass kujakuNotificationImplClass = new KujakuNotificationImplClass(); @@ -153,12 +146,11 @@ public void createNotificationChannelShouldCreateValidNotificationChannelWithout assertNotNull(notificationChannel); assertEquals(channelName, notificationChannel.getName()); assertEquals(channelDescription, notificationChannel.getDescription()); - assertEquals(false, notificationChannel.shouldVibrate()); - assertEquals(true, notificationChannel.shouldShowLights()); + assertFalse(notificationChannel.shouldVibrate()); + assertTrue(notificationChannel.shouldShowLights()); assertEquals(ledColor, notificationChannel.getLightColor()); } - @RequiresApi(Build.VERSION_CODES.O) @Test public void createNotificationChannelShouldCreateValidNotificationChannelWithoutLightsOrVibration() { KujakuNotificationImplClass kujakuNotificationImplClass = new KujakuNotificationImplClass(); @@ -176,7 +168,7 @@ public void createNotificationChannelShouldCreateValidNotificationChannelWithout assertNotNull(notificationChannel); assertEquals(channelName, notificationChannel.getName()); assertEquals(channelDescription, notificationChannel.getDescription()); - assertEquals(false, notificationChannel.shouldVibrate()); - assertEquals(false, notificationChannel.shouldShowLights()); + assertFalse(notificationChannel.shouldVibrate()); + assertFalse(notificationChannel.shouldShowLights()); } } diff --git a/library/src/test/java/io/ona/kujaku/services/TrackingServiceTest.java b/library/src/test/java/io/ona/kujaku/services/TrackingServiceTest.java index 10facdcec..7c3f5971b 100644 --- a/library/src/test/java/io/ona/kujaku/services/TrackingServiceTest.java +++ b/library/src/test/java/io/ona/kujaku/services/TrackingServiceTest.java @@ -42,9 +42,6 @@ import static org.junit.Assert.assertTrue; import static org.robolectric.Shadows.shadowOf; -/** - * Created by Emmanuel Otin - eo@novel-t.ch 03/20/19. - */ @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) public class TrackingServiceTest { @@ -109,7 +106,13 @@ public void testStartingServiceWithoutGpsProvider() { controller = Robolectric.buildService(TrackingService.class, TrackingService.getIntent(context, MapActivity.class, new TrackingServiceHighAccuracyOptions())); + //disable GPS + LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); + ShadowLocationManager shadowLocationManager = shadowOf(locationManager); + shadowLocationManager.setProviderEnabled(GPS_PROVIDER, false); + controller.create().startCommand(0,0); + assertEquals(TrackingService.TrackingServiceStatus.STOPPED_GPS, TrackingService.getTrackingServiceStatus()); controller.destroy(); diff --git a/sample/src/main/java/io/ona/kujaku/sample/activities/CGRIntegrationActivity.java b/sample/src/main/java/io/ona/kujaku/sample/activities/CGRIntegrationActivity.java index 7ff72365a..43bade75b 100644 --- a/sample/src/main/java/io/ona/kujaku/sample/activities/CGRIntegrationActivity.java +++ b/sample/src/main/java/io/ona/kujaku/sample/activities/CGRIntegrationActivity.java @@ -233,7 +233,7 @@ public void onClick(View v) { } }); - genericAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + genericAsyncTask.execute(); } private void showToast(@StringRes int stringRes) { diff --git a/sample/src/main/java/io/ona/kujaku/sample/activities/MainActivity.java b/sample/src/main/java/io/ona/kujaku/sample/activities/MainActivity.java index 0aab18713..063104c35 100644 --- a/sample/src/main/java/io/ona/kujaku/sample/activities/MainActivity.java +++ b/sample/src/main/java/io/ona/kujaku/sample/activities/MainActivity.java @@ -202,7 +202,7 @@ public Object[] call() throws Exception { } }); genericAsyncTask.setOnFinishedListener(onFinishedListener); - genericAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + genericAsyncTask.execute(); } private void setCanStopMapDownload(boolean enabled) { @@ -457,7 +457,7 @@ public Object[] call() throws Exception { } }); genericAsyncTask.setOnFinishedListener(null); - genericAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + genericAsyncTask.execute(); } private void confirmSampleStyleAvailable() { diff --git a/utils/build.gradle b/utils/build.gradle index 16c93726f..20191b3b2 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -65,6 +65,7 @@ dependencies { testImplementation junit testImplementation robolectric + testImplementation 'org.skyscreamer:jsonassert:1.5.3' } tasks.withType(Test) { diff --git a/utils/src/test/java/io/ona/kujaku/helpers/converters/GeoJSONHelperTest.java b/utils/src/test/java/io/ona/kujaku/helpers/converters/GeoJSONHelperTest.java index 3efbcb504..db239d7af 100644 --- a/utils/src/test/java/io/ona/kujaku/helpers/converters/GeoJSONHelperTest.java +++ b/utils/src/test/java/io/ona/kujaku/helpers/converters/GeoJSONHelperTest.java @@ -11,6 +11,7 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; +import org.skyscreamer.jsonassert.JSONAssert; import java.util.ArrayList; import java.util.UUID; @@ -30,7 +31,6 @@ public class GeoJSONHelperTest { @Test public void getFeatureShouldReturnPointFeatureWithoutProperties() { - // Might fail bcoz of Feature collection positioning String geoJsonFeatureCollection = "{\n" + " \"features\": [\n" + " {\n" + @@ -60,8 +60,7 @@ public void getFeatureShouldReturnPointFeatureWithoutProperties() { JSONObject expectedJsonObject = new JSONObject(geoJsonFeatureCollection); JSONObject actualJsonObject = new JSONObject(geoJSONHelper.getJsonFeatureCollection()); - //todo - Make this better - assertEquals(expectedJsonObject.toString(), actualJsonObject.toString()); + JSONAssert.assertEquals(expectedJsonObject.toString(), actualJsonObject.toString(), true); } catch (JSONException e) { e.printStackTrace(); @@ -70,7 +69,6 @@ public void getFeatureShouldReturnPointFeatureWithoutProperties() { @Test public void getGeoJsonShouldReturnGeoJsonWithPointFeatureWithoutProperties() { - // Might fail bcoz of Feature collection positioning String geoJson = "{\n" + " \"type\": \"geojson\",\n" + " \"data\": {\n" + @@ -103,8 +101,7 @@ public void getGeoJsonShouldReturnGeoJsonWithPointFeatureWithoutProperties() { JSONObject expectedJsonObject = new JSONObject(geoJson); JSONObject actualJsonObject = new JSONObject(geoJSONHelper.getGeoJsonData()); - //todo - Make this better - assertEquals(expectedJsonObject.toString(), actualJsonObject.toString()); + JSONAssert.assertEquals(expectedJsonObject.toString(), actualJsonObject.toString(), true); } catch (JSONException e) { e.printStackTrace(); From a13ae1448e1b887c01b4905d26fbc8b666c67b99 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Fri, 26 Jul 2024 16:00:41 +0300 Subject: [PATCH 23/55] =?UTF-8?q?Update=20workflow=20configuration=20?= =?UTF-8?q?=F0=9F=94=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30dac679e..077f4e77b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,35 +17,50 @@ jobs: runs-on: macos-13 steps: - - uses: actions/checkout@v2 + - name: Cancel Previous workflow runs + uses: styfle/cancel-workflow-action@0.9.1 + with: + access_token: ${{ github.token }} + + - name: Checkout 🛎️ + uses: actions/checkout@v4 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: + distribution: temurin java-version: 17 + - name: Create local.properties file run: touch local.properties && echo "mapbox.repo.token=${{ secrets.MAPBOX_SDK_REPO_TOKEN }}" >> local.properties + - name: Print Java version run: java -version + - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Git show commit count run: git fetch origin master && git rev-list --first-parent --count origin/master - - name: Clean project - run: ./gradlew clean --stacktrace - - name: Build project skipping tests - run: ./gradlew build -x test --stacktrace - - name: Run Instrumented Tests manually + + - name: Clean & Build project skipping tests + run: ./gradlew clean build -x test --stacktrace + + - name: Run Instrumented Tests uses: reactivecircus/android-emulator-runner@v2 with: - api-level: 22 + api-level: 34 arch: x86_64 force-avd-creation: true emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none disable-animations: true script: ./gradlew connectedDebug --stacktrace --info + - name: Run jacocoTestReport for each module run: ./gradlew jacocoTestReport --stacktrace --info + - name: Merge jacoco reports from all modules run: ./gradlew jacocoFullReport --stacktrace + - name: Upload coverage to Coveralls with Gradle run: ./gradlew coveralls --stacktrace From 01e91a9236f1808cbac58b8f65499a107cd95724 Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Mon, 29 Jul 2024 15:05:15 +0300 Subject: [PATCH 24/55] =?UTF-8?q?Update=20Github=20workflow=20configuratio?= =?UTF-8?q?ns=20=F0=9F=94=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 39 ++++++++++++++++++++++++++++++----- .github/workflows/library.yml | 7 +++---- .github/workflows/utils.yml | 9 ++++---- 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 077f4e77b..d2c2ef1d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,10 @@ jobs: env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - runs-on: macos-13 + runs-on: ubuntu-latest + strategy: + matrix: + api-level: [34] steps: - name: Cancel Previous workflow runs @@ -31,6 +34,12 @@ jobs: distribution: temurin java-version: 17 + - name: Enable KVM + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + - name: Create local.properties file run: touch local.properties && echo "mapbox.repo.token=${{ secrets.MAPBOX_SDK_REPO_TOKEN }}" >> local.properties @@ -46,18 +55,38 @@ jobs: - name: Clean & Build project skipping tests run: ./gradlew clean build -x test --stacktrace + - name: AVD cache + uses: actions/cache@v4 + id: avd-cache + with: + path: | + ~/.android/avd/* + ~/.android/adb* + key: avd-${{ matrix.api-level }} + + - name: Create AVD and generate snapshot for caching + if: steps.avd-cache.outputs.cache-hit != 'true' + uses: reactivecircus/android-emulator-runner@v2 + with: + api-level: ${{ matrix.api-level }} + arch: x86_64 + force-avd-creation: false + emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + disable-animations: false + script: echo "Generated AVD snapshot for caching." + - name: Run Instrumented Tests uses: reactivecircus/android-emulator-runner@v2 with: - api-level: 34 + api-level: ${{ matrix.api-level }} arch: x86_64 - force-avd-creation: true + force-avd-creation: false emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none disable-animations: true - script: ./gradlew connectedDebug --stacktrace --info + script: ./gradlew connectedDebug --stacktrace - name: Run jacocoTestReport for each module - run: ./gradlew jacocoTestReport --stacktrace --info + run: ./gradlew jacocoTestReport --stacktrace - name: Merge jacoco reports from all modules run: ./gradlew jacocoFullReport --stacktrace diff --git a/.github/workflows/library.yml b/.github/workflows/library.yml index 79cf08562..f980df34d 100644 --- a/.github/workflows/library.yml +++ b/.github/workflows/library.yml @@ -25,13 +25,12 @@ jobs: access_token: ${{ github.token }} - name: Checkout 🛎️ - uses: actions/checkout@v2 - with: - fetch-depth: 2 + uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v1 with: + distribution: temurin java-version: 17 - name: Create local.properties file @@ -58,7 +57,7 @@ jobs: - name: Run Instrumented Tests manually uses: reactivecircus/android-emulator-runner@v2 with: - api-level: 22 + api-level: 34 script: ./gradlew :library:connectedDebug --stacktrace --info - name: Run unit tests with Gradle diff --git a/.github/workflows/utils.yml b/.github/workflows/utils.yml index 5bbcf8469..03d3025e4 100644 --- a/.github/workflows/utils.yml +++ b/.github/workflows/utils.yml @@ -22,16 +22,15 @@ jobs: - name: Cancel previous workflow runs uses: styfle/cancel-workflow-action@0.9.1 with: - access_token: ${{ github.token }} + access_token: ${{ github.token }} - name: Checkout 🛎️ - uses: actions/checkout@v2 - with: - fetch-depth: 2 + uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v1 with: + distribution: temurin java-version: 17 - name: Create local.properties file @@ -58,7 +57,7 @@ jobs: - name: Run Instrumented Tests manually uses: reactivecircus/android-emulator-runner@v2 with: - api-level: 22 + api-level: 34 script: ./gradlew :utils:connectedDebug --stacktrace - name: Generate & upload utils snapshot artifact AAR (Android Archive) file to Sonatype From 43912252cff8dcbe9a71ce4369fd5565ef449fac Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Mon, 29 Jul 2024 15:43:15 +0300 Subject: [PATCH 25/55] =?UTF-8?q?Upgrade=20depdencies=20+=20Migration=20re?= =?UTF-8?q?factor=20=E2=AC=86=EF=B8=8F=20=E2=99=BB=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- build.gradle | 34 ++-- configs.gradle | 2 +- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- jacoco-report.gradle | 32 ++++ library/build.gradle | 45 ++--- library/src/main/AndroidManifest.xml | 1 - .../java/io/ona/kujaku/KujakuLibrary.java | 5 +- .../ona/kujaku/data/realm/RealmDatabase.java | 5 +- .../io/ona/kujaku/tasks/GenericAsyncTask.java | 4 +- .../java/io/ona/kujaku/utils/LogUtil.java | 4 +- library/src/main/res/values/colors.xml | 1 + .../MapboxOfflineDownloaderServiceTest.java | 1 - .../kujaku/services/TrackingServiceTest.java | 69 ++++---- publish.gradle | 14 +- sample/build.gradle | 50 ++---- .../io/ona/kujaku/sample/MyApplication.java | 6 +- .../BaseNavigationDrawerActivity.java | 4 + .../activities/CGRIntegrationActivity.java | 3 +- .../sample/repository/BaseRepository.java | 5 +- .../sample/repository/KujakuRepository.java | 43 +---- .../sample/repository/PointsRepository.java | 7 +- .../res/layout/mapbox_mapview_internal.xml | 163 ++++++++++++++++++ sample/src/main/res/values/colors.xml | 2 + utils/build.gradle | 35 +--- .../kujaku/helpers/MapBoxStyleHelperTest.java | 3 - .../utils/config/DataSourceConfigTest.java | 5 - .../utils/config/InfoWindowConfigTest.java | 2 - .../kujaku/utils/config/KujakuConfigTest.java | 5 - .../utils/config/SortFieldConfigTest.java | 6 +- 31 files changed, 328 insertions(+), 233 deletions(-) create mode 100644 jacoco-report.gradle create mode 100644 sample/src/main/res/layout/mapbox_mapview_internal.xml diff --git a/README.md b/README.md index 6a3f6f7db..1950bc989 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Kujaku (Peacock) ![Build Status](https://github.com/onaio/kujaku/actions/workflows/ci.yml/badge.svg) ![Download](https://badgen.net/maven/v/maven-central/io.ona.kujaku/library) [![Coverage Status](https://coveralls.io/repos/github/onaio/kujaku/badge.svg)](https://coveralls.io/github/onaio/kujaku) -A mapping and check-in library for Android using **MapBox SDK (Version 8.3.3)** +A mapping and check-in library for Android using **MapBox SDK (Version 9.7.1)** ## IMPORTANT UPDATE diff --git a/build.gradle b/build.gradle index 7457e1ccb..c4c41fa2f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,18 +3,16 @@ buildscript { repositories { google() - jcenter() mavenCentral() maven{ url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' + classpath 'com.android.tools.build:gradle:8.4.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' - classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.0' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1' + classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.2' + classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2' //classpath 'com.palantir:jacoco-coverage:0.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -27,10 +25,10 @@ apply from: 'configs.gradle' allprojects { repositories { google() - jcenter() mavenCentral() mavenLocal() maven { url "https://jitpack.io" } + maven { url "https://repository.liferay.com/nexus/content/repositories/public" } maven { url "https://dl.cloudsmith.io/public/terraframe/geoprism-registry/maven/" } @@ -61,7 +59,7 @@ task clean(type: Delete) { apply plugin: 'java' coveralls { - jacocoReportPath = "${buildDir}/reports/jacoco/jacocoFullReport/jacocoFullReport.xml" + jacocoReportPath = layout.buildDirectory.dir("reports/jacoco/jacocoFullReport/jacocoFullReport.xml") sourceDirs += ["utils/src/main/java" , "library/src/main/java" , "sample/src/main/java" @@ -69,6 +67,19 @@ coveralls { } task jacocoFullReport(type: JacocoReport, group: 'Coverage reports') { + + mustRunAfter ":library:testDebugUnitTest" + mustRunAfter ":utils:testDebugUnitTest" + mustRunAfter ":sample:testDebugUnitTest" + + mustRunAfter ":library:connectedDebugAndroidTest" + mustRunAfter ":utils:connectedDebugAndroidTest" + mustRunAfter ":sample:connectedDebugAndroidTest" + + mustRunAfter ":library:jacocoTestReport" + mustRunAfter ":utils:jacocoTestReport" + mustRunAfter ":sample:jacocoTestReport" + description = 'Generates an aggregate report from all subprojects' additionalSourceDirs.from = files(subprojects.sourceSets.main.allSource.srcDirs) @@ -97,12 +108,11 @@ task jacocoFullReport(type: JacocoReport, group: 'Coverage reports') { sourceDirectories.from = sourcePaths classDirectories.from = classPaths - getReports().getXml().setDestination(file("${buildDir}/reports/jacoco/jacocoFullReport/jacocoFullReport.xml")) - getReports().getHtml().setDestination(file("${buildDir}/reports/jacoco/jacocoFullReport/html")) - reports { - html.enabled true - xml.enabled true + xml.required.set(true) + html.required.set(true) + xml.outputLocation = layout.buildDirectory.file("reports/jacoco/jacocoFullReport/jacocoFullReport.xml") + html.outputLocation = layout.buildDirectory.dir("reports/jacoco/jacocoFullReport/html") } jacocoClasspath = files(jacocoClasspathPaths) diff --git a/configs.gradle b/configs.gradle index e5fe9db7d..b95df6d08 100644 --- a/configs.gradle +++ b/configs.gradle @@ -112,7 +112,7 @@ ext { robolectricShadowsMultidexVersion = "4.13" robolectricVersion = "4.13" supportVersion = "1.0.0" - volleyVersion = "1.2.0" + volleyVersion = "1.2.1" targetSdkVersion = 34 // Dependency names diff --git a/gradle.properties b/gradle.properties index 1dc978101..350875f4e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,6 +31,7 @@ POM_SETTING_DEVELOPER_ID=opensrp POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev android.useAndroidX=true android.enableJetifier=true +android.nonFinalResIds=false android.jetifier.ignorelist=shadows,bcprov-jdk18on #android.jetifier.blacklist=shadows,bcprov-jdk15on diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 28c8d73df..8e9ae2342 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Aug 21 19:58:31 EAT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/jacoco-report.gradle b/jacoco-report.gradle new file mode 100644 index 000000000..9d95776c3 --- /dev/null +++ b/jacoco-report.gradle @@ -0,0 +1,32 @@ +// createDebugCoverageReport is not available when android.buildTypes.debug.testCoverageEnabled is false +task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'connectedDebugAndroidTest']) { + //, 'createDebugCoverageReport']) { + + reports { + xml.required.set(true) + html.required.set(true) + xml.outputLocation = layout.buildDirectory.file("reports/jacoco/jacocoRootReport/merged.xml") + html.outputLocation = layout.buildDirectory.dir("reports/jacoco/jacocoRootReport/html") + } + + def fileFilter = [ + "**/R.class", + "**/R\$*.class", + "**/BuildConfig.*", + "**/Manifest*.*", + "**/*Test*.*", + "android/**/*.*", + "io/realm/*.*", + "**/org/mockito/**", + "**/mockito-extensions/**"] + def debugTree = fileTree(dir: layout.buildDirectory.file("intermediates/javac/debug/compileDebugJavaWithJavac/classes/"), excludes: fileFilter) + def mainSrc = "${project.projectDir}/src/main/java" + + sourceDirectories.setFrom([mainSrc]) + classDirectories.setFrom(files([debugTree])) + executionData.setFrom(fileTree(dir: layout.buildDirectory, includes: + [ + "outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec", + "outputs/code_coverage/debugAndroidTest/connected/**/coverage.ec", + ])) +} \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 7e1d8cfeb..cf59d3a3e 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,15 +4,13 @@ apply plugin: 'jacoco' buildscript { repositories { mavenCentral() - jcenter() } dependencies { - classpath "io.realm:realm-gradle-plugin:4.1.1" + classpath "io.realm:realm-gradle-plugin:10.18.0" } } apply plugin: 'realm-android' -apply plugin: 'com.jfrog.bintray' apply plugin: 'maven-publish' version '0.10.2-SNAPSHOT' @@ -25,15 +23,21 @@ jacoco { android { + namespace "io.ona.kujaku" + compileSdk rootProject.ext.compileSdkVersion + buildFeatures { + buildConfig = true + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName this.version @@ -64,7 +68,7 @@ android { debug { // See bug https://github.com/vanniktech/gradle-android-junit-jacoco-plugin/issues/183 - testCoverageEnabled false + testCoverageEnabled true if (project.rootProject.file("local.properties").exists()) { Properties properties = new Properties() @@ -124,13 +128,13 @@ dependencies { configuration -> exclude group: 'com.android.support', module: 'support-v4' } - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'com.google.android.material:material:1.12.0' implementation 'org.simpleframework:simple-xml:2.7.1' implementation 'com.jakewharton.threetenabp:threetenabp:1.1.1' implementation 'com.jakewharton.timber:timber:5.0.1' - implementation 'androidx.multidex:multidex:2.0.0' + implementation 'androidx.multidex:multidex:2.0.1' customDependencies(this, configuration) appPermissionsDependencies(configuration) @@ -154,7 +158,7 @@ private static void testDependencies(instance, configuration) { configuration.androidTestImplementation "org.mockito:mockito-android:$mockitoVersion" configuration.androidTestImplementation "org.mockito:mockito-core:$mockitoVersion" - configuration.androidTestImplementation ('com.android.support.test.espresso:espresso-core:3.1.0', { + configuration.androidTestImplementation ('com.android.support.test.espresso:espresso-core:3.6.1', { exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'net.sf.kxml', module: 'kxml2' }) @@ -184,28 +188,7 @@ tasks.withType(Test) { jacoco.excludes = ['jdk.internal.*'] } -// createDebugCoverageReport is not available when android.buildTypes.debug.testCoverageEnabled is false -task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) { //, 'createDebugCoverageReport']) { - - reports { - xml.enabled = true - html.enabled = true - } - - getReports().getXml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/merged.xml")) - getReports().getHtml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/html")) - - def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*' - , 'android/**/*.*', "io/realm/*.*"] - def debugTree = fileTree(dir: "${buildDir}/intermediates/javac/debug/classes", excludes: fileFilter) - def mainSrc = "${project.projectDir}/src/main/java" - - sourceDirectories.setFrom([mainSrc]) - classDirectories.setFrom(files([debugTree])) - executionData.setFrom(fileTree(dir: project.buildDir, includes: [ - 'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec' - ])) -} // Add github packages, maven-central and sonatype publishing apply from: '../publish.gradle' +apply from: '../jacoco-report.gradle' diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index e21ec3d3a..9155830c6 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ diff --git a/library/src/main/java/io/ona/kujaku/KujakuLibrary.java b/library/src/main/java/io/ona/kujaku/KujakuLibrary.java index 573a58583..25ad67557 100644 --- a/library/src/main/java/io/ona/kujaku/KujakuLibrary.java +++ b/library/src/main/java/io/ona/kujaku/KujakuLibrary.java @@ -26,9 +26,6 @@ import static android.content.Context.ALARM_SERVICE; import static timber.log.Timber.DebugTree; -/** - * @author Vincent Karuri - */ public class KujakuLibrary { private static boolean enableMapDownloadResume; @@ -63,7 +60,7 @@ public static void init(Context context) { AndroidThreeTen.init(context); if (Timber.treeCount() < 1) { - Timber.plant(new DebugTree()); + Timber.plant((Timber.Tree) (Object) new DebugTree()); } } diff --git a/library/src/main/java/io/ona/kujaku/data/realm/RealmDatabase.java b/library/src/main/java/io/ona/kujaku/data/realm/RealmDatabase.java index 3d4ac08bb..dc58fd72b 100644 --- a/library/src/main/java/io/ona/kujaku/data/realm/RealmDatabase.java +++ b/library/src/main/java/io/ona/kujaku/data/realm/RealmDatabase.java @@ -157,9 +157,10 @@ public MapBoxOfflineQueueTask getNextTask() { RealmResults realmResults = realm.where(MapBoxOfflineQueueTask.class) .equalTo("taskStatus", MapBoxOfflineQueueTask.TASK_STATUS_NOT_STARTED) - .findAllSorted("dateUpdated", Sort.ASCENDING); + .sort("dateUpdated", Sort.ASCENDING) + .findAll(); - if (realmResults.size() > 0) { + if (!realmResults.isEmpty()) { return realmResults.first(); } diff --git a/library/src/main/java/io/ona/kujaku/tasks/GenericAsyncTask.java b/library/src/main/java/io/ona/kujaku/tasks/GenericAsyncTask.java index a6d92358f..9e86af226 100644 --- a/library/src/main/java/io/ona/kujaku/tasks/GenericAsyncTask.java +++ b/library/src/main/java/io/ona/kujaku/tasks/GenericAsyncTask.java @@ -16,17 +16,15 @@ public class GenericAsyncTask { private final AsyncTaskCallable toCall; private OnFinishedListener onFinishedListener; - private ExecutorService executorService; - public GenericAsyncTask(@NonNull AsyncTaskCallable toCall) { this.toCall = toCall; } public void execute() { + ExecutorService executorService = Executors.newSingleThreadExecutor(); try { - executorService = Executors.newSingleThreadExecutor(); Future result = executorService.submit(toCall); diff --git a/library/src/main/java/io/ona/kujaku/utils/LogUtil.java b/library/src/main/java/io/ona/kujaku/utils/LogUtil.java index 20540de75..ab23b2749 100644 --- a/library/src/main/java/io/ona/kujaku/utils/LogUtil.java +++ b/library/src/main/java/io/ona/kujaku/utils/LogUtil.java @@ -2,9 +2,7 @@ import android.util.Log; -/** - * Created by Ephraim Kigamba - ekigamba@ona.io on 31/07/2018 - */ +import io.ona.kujaku.BuildConfig; public class LogUtil { diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml index a862c58d9..d761eaae2 100644 --- a/library/src/main/res/values/colors.xml +++ b/library/src/main/res/values/colors.xml @@ -6,4 +6,5 @@ #2979FF #3498db #ffffff + #1E8CAB diff --git a/library/src/test/java/io/ona/kujaku/services/MapboxOfflineDownloaderServiceTest.java b/library/src/test/java/io/ona/kujaku/services/MapboxOfflineDownloaderServiceTest.java index 350602bc8..4d1ef5131 100644 --- a/library/src/test/java/io/ona/kujaku/services/MapboxOfflineDownloaderServiceTest.java +++ b/library/src/test/java/io/ona/kujaku/services/MapboxOfflineDownloaderServiceTest.java @@ -43,7 +43,6 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; -import io.ona.kujaku.BuildConfig; import io.ona.kujaku.data.MapBoxDeleteTask; import io.ona.kujaku.data.MapBoxDownloadTask; import io.ona.kujaku.data.realm.RealmDatabase; diff --git a/library/src/test/java/io/ona/kujaku/services/TrackingServiceTest.java b/library/src/test/java/io/ona/kujaku/services/TrackingServiceTest.java index 7c3f5971b..e6e40d76e 100644 --- a/library/src/test/java/io/ona/kujaku/services/TrackingServiceTest.java +++ b/library/src/test/java/io/ona/kujaku/services/TrackingServiceTest.java @@ -12,6 +12,7 @@ import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; @@ -111,7 +112,7 @@ public void testStartingServiceWithoutGpsProvider() { ShadowLocationManager shadowLocationManager = shadowOf(locationManager); shadowLocationManager.setProviderEnabled(GPS_PROVIDER, false); - controller.create().startCommand(0,0); + controller.create().startCommand(0, 0); assertEquals(TrackingService.TrackingServiceStatus.STOPPED_GPS, TrackingService.getTrackingServiceStatus()); @@ -127,7 +128,7 @@ public void testStartingServiceWithGpsProvider() { ShadowLocationManager shadowLocationManager = shadowOf(locationManager); shadowLocationManager.setProviderEnabled(GPS_PROVIDER, true); - controller.create().startCommand(0,0); + controller.create().startCommand(0, 0); assertEquals(TrackingService.TrackingServiceStatus.WAITING_FIRST_FIX, TrackingService.getTrackingServiceStatus()); assertTrue(TrackingService.isRunning()); @@ -171,23 +172,23 @@ public void testParcelableTrackingServiceSaveBatteryOptions() { @Test public void testTrackingServiceDefaultUiConfiguration() { - TrackingServiceDefaultUIConfiguration uiTrackingService = new TrackingServiceDefaultUIConfiguration(); - assertTrue(uiTrackingService.displayIcons()); + TrackingServiceDefaultUIConfiguration uiTrackingService = new TrackingServiceDefaultUIConfiguration(); + assertTrue(uiTrackingService.displayIcons()); - assertEquals(uiTrackingService.getBackgroundDrawable(), R.drawable.circle_button_black_border); - assertEquals(uiTrackingService.getRecordingDrawable(), R.drawable.ic_recording_red); - assertEquals(uiTrackingService.getStoppedDrawable(), R.drawable.ic_recording_gray); + assertEquals(uiTrackingService.getBackgroundDrawable(), R.drawable.circle_button_black_border); + assertEquals(uiTrackingService.getRecordingDrawable(), R.drawable.ic_recording_red); + assertEquals(uiTrackingService.getStoppedDrawable(), R.drawable.ic_recording_gray); - assertEquals(uiTrackingService.getLayoutWidth(), R.dimen.tracking_service_location_dimen); - assertEquals(uiTrackingService.getLayoutHeight(), R.dimen.tracking_service_location_dimen); + assertEquals(uiTrackingService.getLayoutWidth(), R.dimen.tracking_service_location_dimen); + assertEquals(uiTrackingService.getLayoutHeight(), R.dimen.tracking_service_location_dimen); - assertEquals(uiTrackingService.getLayoutMarginLeft(), R.dimen.tracking_service_location_margin); - assertEquals(uiTrackingService.getLayoutMarginTop(), R.dimen.tracking_service_location_margin); - assertEquals(uiTrackingService.getLayoutMarginRight(), R.dimen.tracking_service_location_margin); - assertEquals(uiTrackingService.getLayoutMarginBottom(), R.dimen.tracking_service_location_margin); + assertEquals(uiTrackingService.getLayoutMarginLeft(), R.dimen.tracking_service_location_margin); + assertEquals(uiTrackingService.getLayoutMarginTop(), R.dimen.tracking_service_location_margin); + assertEquals(uiTrackingService.getLayoutMarginRight(), R.dimen.tracking_service_location_margin); + assertEquals(uiTrackingService.getLayoutMarginBottom(), R.dimen.tracking_service_location_margin); - assertEquals(uiTrackingService.getPadding(), R.dimen.tracking_service_location_padding); - assertEquals(uiTrackingService.getLayoutGravity(), Gravity.TOP | Gravity.LEFT); + assertEquals(uiTrackingService.getPadding(), R.dimen.tracking_service_location_padding); + assertEquals(uiTrackingService.getLayoutGravity(), Gravity.TOP | Gravity.LEFT); } @Test @@ -240,9 +241,9 @@ public void testServiceWithLocationInDistanceTolerance() throws InterruptedExcep controller.get().registerTrackingServiceListener(new TrackingServiceListener() { @Override public void onFirstLocationReceived(KujakuLocation location) { - assertEquals(location.getLatitude(), locationDeparture.getLatitude(),0); - assertEquals(location.getLongitude(), locationDeparture.getLongitude(),0); - assertEquals(location.getTag(), 0,0); + assertEquals(location.getLatitude(), locationDeparture.getLatitude(), 0); + assertEquals(location.getLongitude(), locationDeparture.getLongitude(), 0); + assertEquals(location.getTag(), 0, 0); latch1.countDown(); } @@ -269,7 +270,7 @@ public void onServiceDisconnected() { } }); - controller.create().startCommand(0,0); + controller.create().startCommand(0, 0); Thread.sleep(2000); // TaskService thread waiting for running @@ -297,20 +298,20 @@ public void onServiceDisconnected() { List list = controller.get().getRecordedKujakuLocations(); assertEquals(list.size(), 4); - assertEquals(list.get(0).getLatitude(), location_1.getLatitude(),0); - assertEquals(list.get(0).getLongitude(), location_1.getLongitude(),0); + assertEquals(list.get(0).getLatitude(), location_1.getLatitude(), 0); + assertEquals(list.get(0).getLongitude(), location_1.getLongitude(), 0); - assertEquals(list.get(1).getLatitude(), location_2.getLatitude(),0); - assertEquals(list.get(1).getLongitude(), location_2.getLongitude(),0); + assertEquals(list.get(1).getLatitude(), location_2.getLatitude(), 0); + assertEquals(list.get(1).getLongitude(), location_2.getLongitude(), 0); - assertEquals(list.get(2).getLatitude(), location_3.getLatitude(),0); - assertEquals(list.get(2).getLongitude(), location_3.getLongitude(),0); + assertEquals(list.get(2).getLatitude(), location_3.getLatitude(), 0); + assertEquals(list.get(2).getLongitude(), location_3.getLongitude(), 0); - assertEquals(list.get(3).getLatitude(), locationDeparture.getLatitude(),0); - assertEquals(list.get(3).getLongitude(), locationDeparture.getLongitude(),0); + assertEquals(list.get(3).getLatitude(), locationDeparture.getLatitude(), 0); + assertEquals(list.get(3).getLongitude(), locationDeparture.getLongitude(), 0); assertEquals(list.size(), TrackingService.getCurrentRecordedKujakuLocations().size()); - controller.startCommand(0,0); + controller.startCommand(0, 0); assertEquals(list.size(), TrackingService.getPreviousRecordedKujakuLocations().size()); controller.destroy(); @@ -362,7 +363,7 @@ public long getGpsMinDistance() { ShadowLocationManager shadowLocationManager = shadowOf(locationManager); shadowLocationManager.setProviderEnabled(GPS_PROVIDER, true); - controller.create().startCommand(0,0); + controller.create().startCommand(0, 0); Thread.sleep(2000); // TaskService thread waiting for running @@ -392,11 +393,11 @@ public long getGpsMinDistance() { List list = controller.get().getRecordedKujakuLocations(); assertEquals(5, list.size()); - assertEquals(list.get(0).getTag(), startTag,0); - assertEquals(list.get(1).getTag(), takeLocationTag,0); - assertEquals(list.get(2).getTag(), nextTag,0); - assertEquals(list.get(3).getTag(), nextTag,0); - assertEquals(list.get(4).getTag(), takeLocationTag,0); + assertEquals(list.get(0).getTag(), startTag, 0); + assertEquals(list.get(1).getTag(), takeLocationTag, 0); + assertEquals(list.get(2).getTag(), nextTag, 0); + assertEquals(list.get(3).getTag(), nextTag, 0); + assertEquals(list.get(4).getTag(), takeLocationTag, 0); controller.destroy(); } diff --git a/publish.gradle b/publish.gradle index c6a5ecc67..2a31f894b 100644 --- a/publish.gradle +++ b/publish.gradle @@ -3,7 +3,7 @@ apply plugin: 'signing' task sourceJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier "sources" + getArchiveClassifier().set("sources") } task javaDoc(type: Javadoc) { @@ -15,7 +15,7 @@ task javaDoc(type: Javadoc) { } task javadocJar(type: Jar, dependsOn: javaDoc) { - classifier = 'javadoc' + getArchiveClassifier().set('javadoc') from javaDoc.destinationDir } @@ -43,7 +43,7 @@ def getGithubPackagesAccessToken() { return hasProperty('githubAccessToken') ? githubAccessToken : System.getenv("GITHUB_ACCESS_TOKEN") != null ? System.getenv("GITHUB_ACCESS_TOKEN") : "" } -def getDate() { +static def getDate() { return new Date().format('yyyy-MM-dd HH:mm:ss') } @@ -77,10 +77,10 @@ publishing { } pom { - if (project.name.equals("utils")) { + if (project.name == "utils") { name = 'Kujaku Utils' description = 'Utilities for Mapping and check-in library for Android using MapBox SDK' - } else if (project.name.equals("library")) { + } else if (project.name == "library") { name = 'Kujaku Library' description = 'Mapping and check-in library for Android using MapBox SDK' } @@ -95,8 +95,8 @@ publishing { } developers { developer { - id = 'ekigamba' - name = 'Ephraim Kigamba' + id = 'opensrp' + name = 'OpenSRP Dev' } developer { diff --git a/sample/build.gradle b/sample/build.gradle index 5af0e0fb0..4922f2646 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -8,6 +8,12 @@ jacoco { android { + namespace "io.ona.kujaku.sample" + + buildFeatures { + buildConfig = true + } + compileSdk rootProject.ext.compileSdkVersion compileOptions { @@ -40,7 +46,7 @@ android { debug { // See bug https://github.com/vanniktech/gradle-android-junit-jacoco-plugin/issues/183 - testCoverageEnabled false + testCoverageEnabled true buildConfigField "String", "MAPBOX_SDK_ACCESS_TOKEN", localProperties["mapbox.sdk.token"] buildConfigField "String", "CGR_USERNAME", localProperties["cgr.username"] buildConfigField "String", "CGR_PASSWORD", localProperties["cgr.password"] @@ -67,28 +73,29 @@ dependencies { configuration -> implementation 'com.cocoahero.android:geojson:1.0.1@jar' implementation "com.android.volley:volley:${volleyVersion}" - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'com.github.GrenderG:Toasty:1.3.0' - implementation 'net.zetetic:android-database-sqlcipher:3.5.9@aar' - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.0' + implementation 'net.zetetic:sqlcipher-android:4.6.0@aar' + implementation 'androidx.sqlite:sqlite:2.4.0' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0' firebaseCrashlytics(configuration) - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'com.google.android.material:material:1.12.0' - implementation 'com.jakewharton.timber:timber:4.7.1' + implementation 'com.jakewharton.timber:timber:5.0.1' - implementation ('com.cgr.adapter:cgradapter-android:0.18.1') { + implementation ('com.cgr.adapter:cgradapter-android:0.19.2') { exclude group: "com.android.support", module: "appcompat-v7" } - implementation 'androidx.multidex:multidex:2.0.0' + implementation 'androidx.multidex:multidex:2.0.1' testImplementation junit testImplementation robolectric @@ -143,25 +150,4 @@ tasks.withType(Test) { jacoco.excludes = ['jdk.internal.*'] } -// createDebugCoverageReport is not available when android.buildTypes.debug.testCoverageEnabled is false -task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) { //, 'createDebugCoverageReport']) { - - reports { - xml.enabled = true - html.enabled = true - } - - getReports().getXml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/merged.xml")) - getReports().getHtml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/html")) - - def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*' - , 'android/**/*.*', "io/realm/*.*", "io/ona/kujaku/sample/activities/*.*"] - def debugTree = fileTree(dir: "${buildDir}/intermediates/javac/debug/classes", excludes: fileFilter) - def mainSrc = "${project.projectDir}/src/main/java" - - sourceDirectories.setFrom(files([mainSrc])) - classDirectories.setFrom(files([debugTree])) - executionData.setFrom(fileTree(dir: project.buildDir, includes: [ - 'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec' - ])) -} +apply from: '../jacoco-report.gradle' diff --git a/sample/src/main/java/io/ona/kujaku/sample/MyApplication.java b/sample/src/main/java/io/ona/kujaku/sample/MyApplication.java index 902fbf2dd..7260838fc 100644 --- a/sample/src/main/java/io/ona/kujaku/sample/MyApplication.java +++ b/sample/src/main/java/io/ona/kujaku/sample/MyApplication.java @@ -8,10 +8,6 @@ import static io.ona.kujaku.sample.util.Constants.DATABASE_NAME; -/** - * Created by Ephraim Kigamba - ekigamba@ona.io on 15/11/2017. - */ - public class MyApplication extends MultiDexApplication { private static final String TAG = MyApplication.class.getName(); @@ -31,7 +27,7 @@ public void onCreate() { KujakuLibrary.init(this); // must initialize KujakuLibrary getRepository(); // initialize KujakuRepository - Timber.plant(new Timber.DebugTree()); + Timber.plant((Timber.Tree)(Object)new Timber.DebugTree()); } public static MyApplication getInstance() { diff --git a/sample/src/main/java/io/ona/kujaku/sample/activities/BaseNavigationDrawerActivity.java b/sample/src/main/java/io/ona/kujaku/sample/activities/BaseNavigationDrawerActivity.java index 71ed4f698..3082ed462 100644 --- a/sample/src/main/java/io/ona/kujaku/sample/activities/BaseNavigationDrawerActivity.java +++ b/sample/src/main/java/io/ona/kujaku/sample/activities/BaseNavigationDrawerActivity.java @@ -264,4 +264,8 @@ protected void setSelectedNavigationItem(@IdRes int navigationItem) { } navigationView.setCheckedItem(navigationItem); } + + public static final class RES_CONSTANTS{ + public static final int ACTION_SETTINGS = R.id.action_settings; + } } diff --git a/sample/src/main/java/io/ona/kujaku/sample/activities/CGRIntegrationActivity.java b/sample/src/main/java/io/ona/kujaku/sample/activities/CGRIntegrationActivity.java index 43bade75b..f4c836940 100644 --- a/sample/src/main/java/io/ona/kujaku/sample/activities/CGRIntegrationActivity.java +++ b/sample/src/main/java/io/ona/kujaku/sample/activities/CGRIntegrationActivity.java @@ -42,6 +42,7 @@ import org.commongeoregistry.adapter.dataaccess.GeoObject; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; import io.ona.kujaku.callables.AsyncTaskCallable; @@ -192,7 +193,7 @@ public Object[] call() throws Exception { client.getIdService().populate(30); GeoObject country = client.getGeoObjectByCode("1", "Cambodia"); - ChildTreeNode countryChildren = client.getChildGeoObjects(country.getUid(), country.getType().getCode(), adminHierarchy, true); + ChildTreeNode countryChildren = client.getChildGeoObjects(country.getUid(), country.getType().getCode(), adminHierarchy, true, Calendar.getInstance().getTime()); return new Object[]{country, countryChildren}; } diff --git a/sample/src/main/java/io/ona/kujaku/sample/repository/BaseRepository.java b/sample/src/main/java/io/ona/kujaku/sample/repository/BaseRepository.java index 0ad1c920a..9b69481ca 100644 --- a/sample/src/main/java/io/ona/kujaku/sample/repository/BaseRepository.java +++ b/sample/src/main/java/io/ona/kujaku/sample/repository/BaseRepository.java @@ -1,10 +1,7 @@ package io.ona.kujaku.sample.repository; -import net.sqlcipher.database.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteDatabase; -/** - * @author Vincent Karuri - */ public class BaseRepository { private KujakuRepository repository; diff --git a/sample/src/main/java/io/ona/kujaku/sample/repository/KujakuRepository.java b/sample/src/main/java/io/ona/kujaku/sample/repository/KujakuRepository.java index dc8ce21b1..c282b5c36 100644 --- a/sample/src/main/java/io/ona/kujaku/sample/repository/KujakuRepository.java +++ b/sample/src/main/java/io/ona/kujaku/sample/repository/KujakuRepository.java @@ -1,14 +1,10 @@ package io.ona.kujaku.sample.repository; import android.content.Context; -import android.util.Log; -import net.sqlcipher.database.SQLiteDatabase; -import net.sqlcipher.database.SQLiteOpenHelper; +import net.zetetic.database.sqlcipher.SQLiteDatabase; +import net.zetetic.database.sqlcipher.SQLiteOpenHelper; -/** - * @author Vincent Karuri - */ public class KujakuRepository extends SQLiteOpenHelper { private static final String TAG = PointsRepository.class.getName(); @@ -19,7 +15,7 @@ public class KujakuRepository extends SQLiteOpenHelper { public KujakuRepository(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) { super(context, name, null, version); - SQLiteDatabase.loadLibs(context); // this must be added + System.loadLibrary("sqlcipher"); } @Override @@ -37,39 +33,6 @@ public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers } - public SQLiteDatabase getReadableDatabase() { - return getReadableDatabase(password); - } - - public SQLiteDatabase getWritableDatabase() { - return getWritableDatabase(password); // could add password field if you wanted - } - - @Override - public synchronized SQLiteDatabase getReadableDatabase(String password) { - try { - if (readableDatabase == null || !readableDatabase.isOpen()) { - readableDatabase = super.getReadableDatabase(password); - } - return readableDatabase; - } catch (Exception e) { - Log.e(TAG, "Database Error. " + e.getMessage()); - } - return readableDatabase; - } - - @Override - public synchronized SQLiteDatabase getWritableDatabase(String password) { - try { - if (writableDatabase == null || !writableDatabase.isOpen()) { - writableDatabase = super.getWritableDatabase(password); - } - } catch (Exception e) { - Log.e(TAG, "Database Error. " + e.getMessage()); - } - return writableDatabase; - } - @Override public synchronized void close() { if (readableDatabase != null) { diff --git a/sample/src/main/java/io/ona/kujaku/sample/repository/PointsRepository.java b/sample/src/main/java/io/ona/kujaku/sample/repository/PointsRepository.java index be2d10902..6d1e2a312 100644 --- a/sample/src/main/java/io/ona/kujaku/sample/repository/PointsRepository.java +++ b/sample/src/main/java/io/ona/kujaku/sample/repository/PointsRepository.java @@ -1,9 +1,11 @@ package io.ona.kujaku.sample.repository; +import android.annotation.SuppressLint; +import android.database.Cursor; import android.util.Log; -import net.sqlcipher.Cursor; -import net.sqlcipher.database.SQLiteDatabase; + +import net.zetetic.database.sqlcipher.SQLiteDatabase; import org.apache.commons.lang3.StringUtils; @@ -120,6 +122,7 @@ private List readPoints(Cursor cursor) { return points; } + @SuppressLint("Range") private Point createPoint(Cursor cursor) { return new Point( cursor.getInt(cursor.getColumnIndex(ID)), diff --git a/sample/src/main/res/layout/mapbox_mapview_internal.xml b/sample/src/main/res/layout/mapbox_mapview_internal.xml new file mode 100644 index 000000000..14dc13fae --- /dev/null +++ b/sample/src/main/res/layout/mapbox_mapview_internal.xml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +