Merge pull request #1705 from dhis2/1.5

fix: [VERSION-1.5.1] Update version to 1.5.1

.gitignore

@@ -13,6 +13,7 @@ out
 !.idea
 .idea/*
 !.idea/copyright
+!.idea/gradle.xml
 !.idea/scopes
 .idea/scopes/*
 !.idea/scopes/copyright.xml

build.gradle

@@ -3,7 +3,7 @@ buildscript {
     repositories {
         google()
         mavenLocal()
-        jcenter()
+        mavenCentral()
         maven { url 'https://plugins.gradle.org/m2/' }
     }
 
@@ -18,8 +18,9 @@ allprojects {
     repositories {
         maven { url "https://maven.google.com" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
-        jcenter()
         google()
+        mavenCentral()
+        maven { url "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven" }
         maven { url "https://jitpack.io" }
     }
 }

core/build.gradle

@@ -31,7 +31,7 @@ plugins {
     id "kotlin-android"
     id "kotlin-android-extensions"
     id "kotlin-kapt"
-    id "io.gitlab.arturbosch.detekt" version "1.10.0"
+    //id "io.gitlab.arturbosch.detekt" version "1.18.0"
     id "org.jetbrains.dokka" version "1.4.30" apply false
 }
 
@@ -43,8 +43,8 @@ ext {
             buildToolsVersion: "29.0.3",
             minSdkVersion    : 19,
             targetSdkVersion : 29,
-            versionCode      : 250,
-            versionName      : "1.5.0"
+            versionCode      : 251,
+            versionName      : "1.5.1"
     ]
 
     libraries = [
@@ -78,7 +78,7 @@ ext {
             equalsVerifier  : "3.4.1",
             flipper         : "0.83.0",
             soloader        : "0.10.1",
-            liveDataTesting : "1.1.2",
+            liveDataTesting : "1.2.0",
             commonsLogging  : "1.2",
 
             // google
@@ -227,7 +227,7 @@ dependencies {
     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 "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}") {
@@ -250,7 +250,7 @@ repositories {
     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
 }
 
-detekt {
-    config = files("config/detekt.yml")
-    buildUponDefaultConfig = false
-}
+//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.5.0
-VERSION_CODE=250
+VERSION_NAME=1.5.1
+VERSION_CODE=251
 
 GROUP=org.hisp.dhis