Merge pull request #1375 from dhis2/1.3.0

feat: [DEVELOP] Version 1.3.0
dhis2 · Oct 6, 2020 · 035b4ae · 035b4ae
2 parents 1d1daff + 99dce3c
commit 035b4ae
Show file tree

Hide file tree

Showing 1,349 changed files with 15,422 additions and 6,328 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,9 +24,6 @@ build
 # OSX
 .DS_Store
 
-# Windows
-*.db
-
 # Android
 *.apk
 

diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,8 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-28.0.3
-  - android-28
+  - build-tools-29.0.3
+  - android-29
   - android-22
   - extra-google-google_play_services
   - extra-google-m2repository

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: "com.gradle.build-scan"
-
 buildscript {
     ext.kotlin_version = '1.3.72'
     repositories {
@@ -10,17 +8,7 @@ buildscript {
     }
 
     dependencies {
-        // android gradle plugin
-        classpath "com.android.tools.build:gradle:3.3.1"
-
-        // method count plugin
-        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1"
-
-        // apt plugin for java
-        classpath "net.ltgt.gradle:gradle-apt-plugin:0.9"
-
-        // enables cloud features of gradle plugin
-        classpath "com.gradle:build-scan-plugin:2.0.2"
+        classpath "com.android.tools.build:gradle:4.0.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -39,11 +27,6 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-buildScan {
-    termsOfServiceUrl = "https://gradle.com/terms-of-service"
-    termsOfServiceAgree = "yes"
-}
-
 subprojects { project ->
     group = GROUP
     version = VERSION_NAME

diff --git a/build.sh b/build.sh
@@ -6,4 +6,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROJECT_DIR=$DIR/
 
 # This will: compile the project, run lint, run tests under JVM, package apk, check the code quality and run tests on the device/emulator.
-"$PROJECT_DIR"/gradlew clean checkstyleDebug findbugsDebug pmdDebug lintDebug testDebug connectedDebugAndroidTest --scan
+"$PROJECT_DIR"/gradlew clean checkstyleDebug pmdDebug lintDebug detekt testDebug connectedDebugAndroidTest
diff --git a/core/build.gradle b/core/build.gradle
@@ -26,59 +26,62 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-apply plugin: "kotlin-android-extensions"
+plugins {
+    id "com.android.library"
+    id "kotlin-android"
+    id "kotlin-android-extensions"
+    id "io.gitlab.arturbosch.detekt" version "1.10.0"
+}
+
 apply from: project.file("plugins/android-checkstyle.gradle")
-apply from: project.file("plugins/android-findbugs.gradle")
 apply from: project.file("plugins/android-pmd.gradle")
 
 ext {
     configuration = [
-            buildToolsVersion: "28.0.3",
+            buildToolsVersion: "29.0.3",
             minSdkVersion    : 19,
-            targetSdkVersion : 28,
-            versionCode      : 221,
-            versionName      : "1.2.1"
+            targetSdkVersion : 29,
+            versionCode      : 230,
+            versionName      : "1.3.0"
     ]
 
     libraries = [
             // android
-            support         : '1.0.0-beta01',
-            paging          : '2.1.0',
+            annotation      : '1.1.0',
+            paging          : '2.1.2',
 
             // java
-            jackson         : "2.9.8",
-            autovalue       : "1.3",
-            autovaluecursor : "1.0.1",
-            retrofit        : "2.5.0",
-            okhttp          : "3.14.0",
-            duktape         : "1.1.0",
-            dagger          : "2.14.1",
-            rxjava          : "2.2.8",
-            rxandroid       : "2.1.1",
-            sqlcipher       : "4.2.0",
-
-            // code checks
-            findbugs        : "3.0.0",
+            apacheCommons   : "3.3.7",
+            jackson         : "2.11.2",
+            autoValue       : "1.3",
+            autoValueCursor : "1.0.1",
+            retrofit        : "2.6.4",
+            okHttp          : "3.12.0",
+            dagger          : "2.28.3",
+            rxJava          : "2.2.9",
+            rxAndroid       : "2.1.1",
+            sqlCipher       : "4.4.0",
+            jexl            : "2.1.1",
+            jodaTime        : "2.10.6",
+            smsCompression  : "0.2.0",
+            antlr           : "4.7.2", // Upgrading throws a runtime warning
+            expressionParser: "1.0.11",
 
             // test dependencies
-            coretesting     : "1.1.1",
-            junit           : "4.12",
-            assertj         : "3.11.1",
-            mockito         : "2.24.5",
-            dexmaker        : "2.21.0",
-            truth           : "0.30",
-            testrunner      : '1.1.0-alpha4',
-            equalsverifier  : "2.1.8",
-            stetho          : "1.5.0",
-            livedatatesting : "1.1.0",
-
-            // plugins
-            errorpronecore  : "2.0.15",
+            coreTesting     : "1.1.1",
+            jUnit           : "4.13",
+            assertJ         : "3.16.1",
+            mockito         : "3.4.6",
+            mockitoKotlin   : "2.2.0",
+            truth           : "1.0.1",
+            testRunner      : "1.2.0",
+            equalsVerifier  : "3.4.1",
+            stetho          : "1.5.1",
+            liveDataTesting : "1.1.2",
+            commonsLogging  : "1.2",
 
             // google
-            safetynet  : "16.0.0",
+            safetyNet  : "17.0.0",
     ]
 }
 
@@ -148,20 +151,20 @@ android {
 
 
 dependencies {
+    // RxJava
+    api "io.reactivex.rxjava2:rxjava:${libraries.rxJava}"
+    api "io.reactivex.rxjava2:rxandroid:${libraries.rxAndroid}"
 
-    api "io.reactivex.rxjava2:rxjava:${libraries.rxjava}"
-    api "io.reactivex.rxjava2:rxandroid:${libraries.rxandroid}"
-
-    // Support libraries
-    api "androidx.annotation:annotation:${libraries.support}"
-
+    // AndroidX
+    api "androidx.annotation:annotation:${libraries.annotation}"
     api "androidx.paging:paging-runtime:${libraries.paging}"
 
-    // Google's auto-value. Annotations are used only during compilation time, as well as
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    // annotation processor which hoops up into compilation process
-    compileOnly "com.google.auto.value:auto-value:${libraries.autovalue}"
-    annotationProcessor "com.google.auto.value:auto-value:${libraries.autovalue}"
+    // Auto Value
+    compileOnly "com.google.auto.value:auto-value:${libraries.autoValue}"
+    annotationProcessor "com.google.auto.value:auto-value:${libraries.autoValue}"
 
     // Dagger
     api "com.google.dagger:dagger:${libraries.dagger}"
@@ -171,58 +174,55 @@ dependencies {
     api "com.fasterxml.jackson.core:jackson-databind:${libraries.jackson}"
 
     // Google's play services
-    api "com.google.android.gms:play-services-safetynet:${libraries.safetynet}"
+    api "com.google.android.gms:play-services-safetynet:${libraries.safetyNet}"
 
     // Square libraries
-    api "com.squareup.okhttp3:okhttp:${libraries.okhttp}"
+    api "com.squareup.okhttp3:okhttp:${libraries.okHttp}"
     api "com.squareup.retrofit2:retrofit:${libraries.retrofit}"
     api "com.squareup.retrofit2:converter-jackson:${libraries.retrofit}"
     api "com.squareup.retrofit2:adapter-rxjava2:${libraries.retrofit}"
 
     // Apache libraries
-    api "org.apache.commons:commons-lang3:3.7"
-    api("org.apache.commons:commons-jexl:2.1.1") {
+    api "org.apache.commons:commons-lang3:${libraries.apacheCommons}"
+    api("org.apache.commons:commons-jexl:${libraries.jexl}") {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
-    testImplementation "commons-logging:commons-logging:1.2"
 
     // Joda time
-    api "joda-time:joda-time:2.9.9"
+    api "joda-time:joda-time:${libraries.jodaTime}"
 
     // sms compression library
-    api 'com.github.dhis2:sms-compression:0.2.0'
+    api "com.github.dhis2:sms-compression:${libraries.smsCompression}"
 
     // DHIS 2 antlr expression parser
-    api "org.hisp.dhis.parser:dhis-antlr-expression-parser:1.0.7-SNAPSHOT"
+    api "org.antlr:antlr4-runtime:${libraries.antlr}"
+    api "org.hisp.dhis.parser:dhis-antlr-expression-parser:${libraries.expressionParser}"
 
     // Extension which generates mappers for work with cursor and content values
-    api "com.gabrielittner.auto.value:auto-value-cursor-annotations:${libraries.autovaluecursor}"
-    annotationProcessor "com.gabrielittner.auto.value:auto-value-cursor:${libraries.autovaluecursor}"
+    api "com.gabrielittner.auto.value:auto-value-cursor-annotations:${libraries.autoValueCursor}"
+    annotationProcessor "com.gabrielittner.auto.value:auto-value-cursor:${libraries.autoValueCursor}"
 
-    api "net.zetetic:android-database-sqlcipher:${libraries.sqlcipher}"
+    api "net.zetetic:android-database-sqlcipher:${libraries.sqlCipher}"
 
-    api "com.google.code.findbugs:annotations:${libraries.findbugs}"
-
-    api "org.antlr:antlr4-runtime:4.7.2"
-
-    api "com.squareup.okhttp3:mockwebserver:${libraries.okhttp}"
+    api "com.squareup.okhttp3:mockwebserver:${libraries.okHttp}"
 
     // Java test dependencies
-    testImplementation "junit:junit:${libraries.junit}"
+    testImplementation "junit:junit:${libraries.jUnit}"
     testImplementation "org.mockito:mockito-core:${libraries.mockito}"
-    testImplementation "org.assertj:assertj-core:${libraries.assertj}"
-    testImplementation "nl.jqno.equalsverifier:equalsverifier:${libraries.equalsverifier}"
-    testImplementation "com.squareup.okhttp3:mockwebserver:${libraries.okhttp}"
-    testImplementation "com.google.code.findbugs:annotations:${libraries.findbugs}"
-    testImplementation "androidx.test:runner:${libraries.testrunner}"
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${libraries.mockitoKotlin}"
+    testImplementation "org.assertj:assertj-core:${libraries.assertJ}"
+    testImplementation "nl.jqno.equalsverifier:equalsverifier:${libraries.equalsVerifier}"
+    testImplementation "com.squareup.okhttp3:mockwebserver:${libraries.okHttp}"
+    testImplementation "androidx.test:runner:${libraries.testRunner}"
+    testImplementation "commons-logging:commons-logging:${libraries.commonsLogging}"
 
     // Android test dependencies
-    androidTestImplementation "commons-logging:commons-logging:1.2"
+    androidTestImplementation "commons-logging:commons-logging:${libraries.commonsLogging}"
     androidTestImplementation "org.mockito:mockito-core:${libraries.mockito}"
-    androidTestImplementation "android.arch.core:core-testing:${libraries.coretesting}"
-    androidTestImplementation "com.jraska.livedata:testing:${libraries.livedatatesting}"
-    androidTestImplementation "androidx.test:runner:${libraries.testrunner}"
-    androidTestImplementation "com.squareup.okhttp3:logging-interceptor:${libraries.okhttp}"
+    androidTestImplementation "android.arch.core:core-testing:${libraries.coreTesting}"
+    androidTestImplementation "com.jraska.livedata:testing:${libraries.liveDataTesting}"
+    androidTestImplementation "androidx.test:runner:${libraries.testRunner}"
+    androidTestImplementation "com.squareup.okhttp3:logging-interceptor:${libraries.okHttp}"
     androidTestImplementation("com.google.truth:truth:${libraries.truth}") {
         exclude group: 'junit' // Android has JUnit built in.
     }
@@ -233,11 +233,15 @@ dependencies {
         exclude module: 'okhttp'
         exclude module: 'jsr305'
     }
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 apply from: project.file("plugins/gradle-mvn-push.gradle")
 repositories {
     mavenCentral()
     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+}
+
+detekt {
+    config = files("config/detekt.yml")
+    buildUponDefaultConfig = false
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,9 +24,6 @@ build @@
     # OSX
     .DS_Store
-    # Windows
-    *.db
     # Android
     *.apk
@@ Expand Down @@