Merge pull request #1553 from dhis2/1.4

feat: [1.4] Release 1.4

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+max_line_length = 120
+disabled_rules=no-wildcard-imports

.gitignore

@@ -9,8 +9,13 @@
 *.iws
 out
 
-# ignore .idea directory
-.idea/
+# ignore .idea directory, except copyright
+!.idea
+.idea/*
+!.idea/copyright
+!.idea/scopes
+.idea/scopes/*
+!.idea/scopes/copyright.xml
 
 # Ant
 build.xml

build.gradle

@@ -10,6 +10,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:4.0.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jlleitschuh.gradle:ktlint-gradle:9.3.0"
     }
 }
 
@@ -30,4 +31,12 @@ task clean(type: Delete) {
 subprojects { project ->
     group = GROUP
     version = VERSION_NAME
+
+    apply plugin: "org.jlleitschuh.gradle.ktlint"
+
+    ktlint {
+        version = "0.37.2"
+        android = true
+        outputColorName = "RED"
+    }
 }

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 pmdDebug lintDebug detekt testDebug connectedDebugAndroidTest
+"$PROJECT_DIR"/gradlew clean ktlintCheck detekt checkstyleDebug pmdDebug lintDebug testDebug connectedDebugAndroidTest compileReleaseKotlin

core/build.gradle

@@ -30,7 +30,9 @@ plugins {
     id "com.android.library"
     id "kotlin-android"
     id "kotlin-android-extensions"
+    id "kotlin-kapt"
     id "io.gitlab.arturbosch.detekt" version "1.10.0"
+    id "org.jetbrains.dokka" version "1.4.30" apply false
 }
 
 apply from: project.file("plugins/android-checkstyle.gradle")
@@ -41,8 +43,8 @@ ext {
             buildToolsVersion: "29.0.3",
             minSdkVersion    : 19,
             targetSdkVersion : 29,
-            versionCode      : 232,
-            versionName      : "1.3.2"
+            versionCode      : 240,
+            versionName      : "1.4.0"
     ]
 
     libraries = [
@@ -53,8 +55,8 @@ ext {
             // java
             apacheCommons   : "3.3.7",
             jackson         : "2.11.2",
-            autoValue       : "1.3",
-            autoValueCursor : "1.0.1",
+            autoValue       : "1.7.4",
+            autoValueCursor : "2.0.1",
             retrofit        : "2.6.4",
             okHttp          : "3.12.0",
             dagger          : "2.28.3",
@@ -64,24 +66,26 @@ ext {
             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",
+            expressionParser: "1.0.15",
 
             // test dependencies
             coreTesting     : "1.1.1",
             jUnit           : "4.13",
-            assertJ         : "3.16.1",
             mockito         : "3.4.6",
             mockitoKotlin   : "2.2.0",
-            truth           : "1.0.1",
+            truth           : "1.1.2",
             testRunner      : "1.2.0",
             equalsVerifier  : "3.4.1",
-            stetho          : "1.5.1",
+            flipper         : "0.83.0",
+            soloader        : "0.10.1",
             liveDataTesting : "1.1.2",
             commonsLogging  : "1.2",
 
             // google
-            safetyNet  : "17.0.0",
+            safetyNet       : "17.0.0",
+
+            // open id
+            appauth         : "0.7.1"
     ]
 }
 
@@ -163,15 +167,17 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Auto Value
-    compileOnly "com.google.auto.value:auto-value:${libraries.autoValue}"
-    annotationProcessor "com.google.auto.value:auto-value:${libraries.autoValue}"
+    api "com.google.auto.value:auto-value-annotations:${libraries.autoValue}"
+    kapt "com.google.auto.value:auto-value:${libraries.autoValue}"
 
     // Dagger
     api "com.google.dagger:dagger:${libraries.dagger}"
-    annotationProcessor "com.google.dagger:dagger-compiler:${libraries.dagger}"
+    kapt "com.google.dagger:dagger-compiler:${libraries.dagger}"
 
     // Jackson
     api "com.fasterxml.jackson.core:jackson-databind:${libraries.jackson}"
+    api "com.fasterxml.jackson.module:jackson-module-kotlin:${libraries.jackson}"
+
 
     // Google's play services
     api "com.google.android.gms:play-services-safetynet:${libraries.safetyNet}"
@@ -195,12 +201,11 @@ dependencies {
     api "com.github.dhis2:sms-compression:${libraries.smsCompression}"
 
     // DHIS 2 antlr expression parser
-    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}"
+    kapt "com.gabrielittner.auto.value:auto-value-cursor:${libraries.autoValueCursor}"
 
     api "net.zetetic:android-database-sqlcipher:${libraries.sqlCipher}"
 
@@ -210,7 +215,9 @@ dependencies {
     testImplementation "junit:junit:${libraries.jUnit}"
     testImplementation "org.mockito:mockito-core:${libraries.mockito}"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${libraries.mockitoKotlin}"
-    testImplementation "org.assertj:assertj-core:${libraries.assertJ}"
+    testImplementation("com.google.truth:truth:${libraries.truth}") {
+        exclude group: 'junit' // Android has JUnit built in.
+    }
     testImplementation "nl.jqno.equalsverifier:equalsverifier:${libraries.equalsVerifier}"
     testImplementation "com.squareup.okhttp3:mockwebserver:${libraries.okHttp}"
     testImplementation "androidx.test:runner:${libraries.testRunner}"
@@ -226,13 +233,15 @@ dependencies {
     androidTestImplementation("com.google.truth:truth:${libraries.truth}") {
         exclude group: 'junit' // Android has JUnit built in.
     }
-    androidTestImplementation("com.facebook.stetho:stetho:${libraries.stetho}") {
-        exclude module: 'jsr305'
-    }
-    androidTestImplementation("com.facebook.stetho:stetho-okhttp3:${libraries.stetho}") {
-        exclude module: 'okhttp'
-        exclude module: 'jsr305'
+    debugImplementation "com.facebook.flipper:flipper:${libraries.flipper}"
+    debugImplementation "com.facebook.soloader:soloader:${libraries.soloader}"
+    debugImplementation ("com.facebook.flipper:flipper-network-plugin:${libraries.flipper}") {
+        exclude group: 'com.squareup.okhttp3'
     }
+
+    releaseImplementation "com.facebook.flipper:flipper-noop:${libraries.flipper}"
+
+    implementation "net.openid:appauth:${libraries.appauth}"
 }
 
 apply from: project.file("plugins/gradle-mvn-push.gradle")
@@ -244,4 +253,4 @@ repositories {
 detekt {
     config = files("config/detekt.yml")
     buildUponDefaultConfig = false
-}
+}

core/gradle.properties

@@ -29,8 +29,8 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=1.3.2
-VERSION_CODE=232
+VERSION_NAME=1.4.0
+VERSION_CODE=240
 
 GROUP=org.hisp.dhis