From eda6106de8a9f7cb8d011635fb874505558ae38c Mon Sep 17 00:00:00 2001
From: Benjamin Gamard <b.gamard@sismics.com>
Date: Wed, 15 Nov 2017 00:19:12 +0100
Subject: [PATCH] upgrade android build

---
 docs-android/app/build.gradle                 | 34 ++++++-------------
 .../app/src/main/res/values-fr/strings.xml    | 10 +++---
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +--
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/docs-android/app/build.gradle b/docs-android/app/build.gradle
index 6c2f2d82..4d0bb94a 100644
--- a/docs-android/app/build.gradle
+++ b/docs-android/app/build.gradle
@@ -1,43 +1,29 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 apply plugin: 'com.android.application'
 
 repositories {
     jcenter()
+    google()
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24'
+    compileSdkVersion 26
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 24
+        targetSdkVersion 26
         versionCode 1
         versionName '1.0'
     }
 
-    signingConfigs {
-        release {
-            storeFile file(System.getenv('TRACKINO_STORE_PATH'))
-            storePassword System.getenv('TRACKINO_STORE_PASS')
-            keyAlias System.getenv('TRACKINO_STORE_ALIAS')
-            keyPassword System.getenv('TRACKINO_STORE_KEYPASS')
-        }
-    }
-
-    buildTypes {
-        release {
-            signingConfig signingConfigs.release
-        }
-    }
-
     lintOptions {
         abortOnError false
     }
@@ -45,13 +31,13 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile 'com.android.support:appcompat-v7:24.0.0'
-    compile 'com.android.support:recyclerview-v7:24.0.0'
-    compile 'com.android.support:design:24.0.0'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:recyclerview-v7:26.1.0'
+    compile 'com.android.support:design:26.1.0'
     compile 'it.sephiroth.android.library.imagezoom:imagezoom:1.0.5'
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.squareup.okhttp3:okhttp:3.4.0'
+    compile 'com.squareup.okhttp3:okhttp:3.7.0'
     compile 'com.squareup.okhttp3:okhttp-urlconnection:3.4.0'
-    compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2'
+    compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
 }
diff --git a/docs-android/app/src/main/res/values-fr/strings.xml b/docs-android/app/src/main/res/values-fr/strings.xml
index dca0e4d7..8933a715 100644
--- a/docs-android/app/src/main/res/values-fr/strings.xml
+++ b/docs-android/app/src/main/res/values-fr/strings.xml
@@ -25,9 +25,9 @@
     <string name="invalid_url_title">URL invalide</string>
     <string name="invalid_url">Veuillez vérifier l\URL du serveur et réessayer</string>
     <string name="crash_toast_text">Une erreur s\'est produite, un rapport a été envoyé afin de corriger ce problème</string>
-    <string name="created_date">Date de création</string>
+    <string name="created_date">Date création</string>
     <string name="download_file">Télécharger ce fichier</string>
-    <string name="download_document">Téléchagrer</string>
+    <string name="download_document">Télécharger</string>
     <string name="action_search">Rechercher dans les documents</string>
     <string name="all_documents">Tous les documents</string>
     <string name="shared_documents">Documents partagés</string>
@@ -51,7 +51,7 @@
     <string name="share_default_name">Lien de partage</string>
     <string name="error_deleting_share">Erreur lors de la suppression de ce partage</string>
     <string name="send_share_to">Envoi ce lien de partage à</string>
-    <string name="upload_file">Ajouter un fichier</string>
+    <string name="upload_file">Aj. fichier</string>
     <string name="upload_from">Envoyer un fichier depuis</string>
     <string name="settings">Paramètres</string>
     <string name="logout">Déconnexion</string>
@@ -73,7 +73,7 @@
     <string name="error_editing_document">Erreur réseau, veuillez réessayer</string>
     <string name="please_wait">Veuillez patienter</string>
     <string name="document_editing_message">Envoi des données</string>
-    <string name="delete_document">Supprimer</string>
+    <string name="delete_document">Suppr.</string>
     <string name="delete_document_title">Supprimer le document</string>
     <string name="delete_document_message">Etes-vous sûr de vouloir supprimer ce document et tous les fichiers associés ?</string>
     <string name="document_delete_failure">Erreur réseau lors de la suppression de ce document</string>
@@ -86,7 +86,7 @@
     <string name="upload_notification_title">Sismics Docs</string>
     <string name="upload_notification_message">Envoi du nouveau fichier</string>
     <string name="upload_notification_error">Erreur lors de l\'envoi du nouveau fichier</string>
-    <string name="delete_file">Suppression de ce fichier</string>
+    <string name="delete_file">Supprimer ce fichier</string>
     <string name="advanced_search">Recherche avancée</string>
     <string name="search">Rechercher</string>
     <string name="add_tags">Ajouter des tags</string>
diff --git a/docs-android/gradle/wrapper/gradle-wrapper.properties b/docs-android/gradle/wrapper/gradle-wrapper.properties
index 5d465776..0d66fbab 100644
--- a/docs-android/gradle/wrapper/gradle-wrapper.properties
+++ b/docs-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Dec 23 21:14:18 CET 2016
+#Tue Nov 14 23:55:56 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip