Merge branch 'release/0.2.4'

build.gradle

@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:9.1.1"
         // NOTE: Do not place your application dependencies here; they belong

commons/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-version = "0.6.0"
+version = "0.6.1"
 
 android {
     compileSdkVersion 28
@@ -50,7 +50,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0"
-    api 'androidx.room:room-runtime:2.2.3'
+    api 'androidx.room:room-runtime:2.2.4'
 
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'androidx.arch.core:core-testing:2.1.0'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Aug 21 20:44:10 CEST 2019
+#Mon Feb 24 20:50:38 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

sync/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: "kotlin-kapt"
 
-version = "0.2.3"
+version = "0.2.4"
 
 android {
     compileSdkVersion 28
@@ -64,16 +64,16 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.0-alpha01'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
-    implementation 'androidx.work:work-runtime:2.3.1'
-    implementation 'androidx.work:work-runtime-ktx:2.3.1'
+    implementation 'androidx.work:work-runtime:2.3.2'
+    implementation 'androidx.work:work-runtime-ktx:2.3.2'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.preference:preference:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha04'
+    implementation 'com.google.android.material:material:1.2.0-alpha05'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.squareup.retrofit2:retrofit:2.6.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.12.0'
-    kapt 'androidx.room:room-compiler:2.2.3'
+    kapt 'androidx.room:room-compiler:2.2.4'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'

sync/src/debug/AndroidManifest.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="fr.geonature.sync">
 
     <application
         android:name=".MainApplication"
-        android:networkSecurityConfig="@xml/network_security_config"
-        tools:targetApi="n"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        android:usesCleartextTraffic="true"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning"
+        tools:targetApi="n">
 
     </application>
 

sync/version.properties

@@ -1,2 +1,2 @@
-#Sun Feb 23 14:55:02 CET 2020
-VERSION_CODE=2070
+#Tue Feb 25 21:34:41 CET 2020
+VERSION_CODE=2080