From 0620810e4b4b576faad58c4c5158804bd16b905f Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Tue, 29 Oct 2013 16:17:18 +0100
Subject: [PATCH] Upgraded to build tools 18.1.1 and gradle 1.8

---
 KdeConnect/src/main/res/values-es/strings.xml | 57 -------------------
 KdeConnect/src/main/res/values-fr/strings.xml | 54 ------------------
 KdeConnect/src/main/res/values-ru/strings.xml | 57 -------------------
 build.gradle                                  | 16 +++---
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 kdeconnect-android.iml                        |  4 +-
 6 files changed, 12 insertions(+), 180 deletions(-)
 delete mode 100644 KdeConnect/src/main/res/values-es/strings.xml
 delete mode 100644 KdeConnect/src/main/res/values-fr/strings.xml
 delete mode 100644 KdeConnect/src/main/res/values-ru/strings.xml

diff --git a/KdeConnect/src/main/res/values-es/strings.xml b/KdeConnect/src/main/res/values-es/strings.xml
deleted file mode 100644
index f20725a3..00000000
--- a/KdeConnect/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-  <string name="pref_plugin_telephony">Notificador de telefonía</string>
-  <string name="pref_plugin_telephony_desc">Enviar notificaciones de SMS y llamadas</string>
-  <string name="pref_plugin_battery">Informe de la batería</string>
-  <string name="pref_plugin_battery_desc">Informar periódicamente del estado de la batería</string>
-  <string name="pref_plugin_clipboard">Sincronización del portapapeles</string>
-  <string name="pref_plugin_clipboard_desc">Compartir el contenido del portapapeles</string>
-  <string name="pref_plugin_mpris">Controles remotos multimedia</string>
-  <string name="pref_plugin_mpris_desc">Controlar audio y vídeo desde el teléfono</string>
-  <string name="pref_plugin_ping">Ping</string>
-  <string name="pref_plugin_ping_desc">Enviar y recibir pings</string>
-  <string name="pref_plugin_notifications">Sincronizar notificaciones</string>
-  <string name="pref_plugin_notifications_desc">Acceder a las notificaciones desde otros dispositivos</string>
-  <string name="plugin_not_available">Esta función no está disponible en su versión de Android</string>
-  <string name="device_list_empty">Ningún dispositivo</string>
-  <string name="ok">Aceptar</string>
-  <string name="cancel">Cancelar</string>
-  <string name="open_settings">Abrir preferencias</string>
-  <string name="no_permissions">Debe otorgar permiso para acceder a las notificaciones</string>
-  <string name="send_ping">Enviar ping</string>
-  <string name="open_mpris_controls">Abrir control remoto</string>
-  <string name="category_connected_devices">Dispositivos conectados</string>
-  <string name="category_not_paired_devices">Dispositivos no vinculados</string>
-  <string name="category_remembered_devices">Dispositivos recordados</string>
-  <string name="plugins_failed_to_load">Complementos cuya carga ha fallado (toque para más información):</string>
-  <string name="device_menu_plugins">Seleccionar complementos</string>
-  <string name="device_menu_unpair">Desvincular</string>
-  <string name="unknown_device">Dispositivo desconocido</string>
-  <string name="error_not_reachable">No se encuentra el dispositivo</string>
-  <string name="error_already_requested">Ya ha solicitado vincularse</string>
-  <string name="error_already_paired">Dispositivo ya vinculado</string>
-  <string name="error_could_not_send_package">No se puede enviar el paquete</string>
-  <string name="error_timed_out">Se ha agotado el tiempo</string>
-  <string name="error_canceled_by_user">Cancelado por el usuario</string>
-  <string name="error_canceled_by_other_peer">Cancelado por la otra parte</string>
-  <string name="error_invalid_key">Se ha recibido una clave no valida</string>
-  <string name="pair_requested">Vinculación solicitada</string>
-  <string name="pairing_request_from">Solicitud de vinculación de %1s</string>
-  <string name="tap_to_answer">Toque para responder</string>
-  <string name="reconnect">Reconectar</string>
-  <string name="device_not_paired">Dispositivo no vinculado</string>
-  <string name="request_pairing">Solicitar vinculación</string>
-  <string name="pairing_accept">Aceptar</string>
-  <string name="pairing_reject">Rechazar</string>
-  <string name="device">Dispositivo</string>
-  <string name="pair_device">Vincular dispositivo</string>
-  <string name="remote_control">Control remoto</string>
-  <string name="settings">Preferencias de KDE Connect</string>
-  <string name="mpris_play">Reproducir</string>
-  <string name="mpris_previous">Anterior</string>
-  <string name="mpris_next">Siguiente</string>
-  <string name="mpris_volume">Volumen</string>
-  <string name="share_to">Compartir con...</string>
-  <string name="protocol_version_older">Este dispositivo usa una versión antigua del protocolo</string>
-  <string name="protocol_version_newer">Este dispositivo usa una versión más reciente del protocolo</string>
-</resources>
diff --git a/KdeConnect/src/main/res/values-fr/strings.xml b/KdeConnect/src/main/res/values-fr/strings.xml
deleted file mode 100644
index 80752b1a..00000000
--- a/KdeConnect/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-  <string name="pref_plugin_telephony">Notificateur de téléphonie</string>
-  <string name="pref_plugin_telephony_desc">Envoie des notifications pour les SMS et les appels</string>
-  <string name="pref_plugin_battery">Rapport sur la batterie</string>
-  <string name="pref_plugin_battery_desc">Rapport périodique sur l\'état de la batterie</string>
-  <string name="pref_plugin_clipboard">Synchronisation avec le presse-papiers</string>
-  <string name="pref_plugin_clipboard_desc">Partage le contenu du presse-papiers</string>
-  <string name="pref_plugin_mpris">Contrôles distants multimédia</string>
-  <string name="pref_plugin_mpris_desc">Contrôle l\'audio / la vidéo depuis votre téléphone</string>
-  <string name="pref_plugin_ping">Commande « Ping »</string>
-  <string name="pref_plugin_ping_desc">Envoie et reçoit des commandes « Ping »</string>
-  <string name="pref_plugin_notifications">Synchronisation des notifications</string>
-  <string name="pref_plugin_notifications_desc">Accédez à vos notifications depuis d\'autres périphériques</string>
-  <string name="plugin_not_available">Cette fonctionnalité n\'est pas disponible dans votre version de Android</string>
-  <string name="device_list_empty">Pas de périphériques</string>
-  <string name="ok">Ok</string>
-  <string name="cancel">Annuler</string>
-  <string name="open_settings">Accéder aux paramètres</string>
-  <string name="no_permissions">Vous devez accorder la permission d\'accéder aux notifications</string>
-  <string name="send_ping">Envoyer un « Ping »</string>
-  <string name="open_mpris_controls">Ouvrir un contrôle distant</string>
-  <string name="category_connected_devices">Périphériques connectés</string>
-  <string name="category_not_paired_devices">Pas de périphériques appariés</string>
-  <string name="category_remembered_devices">Périphériques mémorisés</string>
-  <string name="plugins_failed_to_load">Le chargement des modules externes a échoué (cliquez pour plus d\'informations) :</string>
-  <string name="device_menu_plugins">Sélectionner des modules externes</string>
-  <string name="device_menu_unpair">Désapparier</string>
-  <string name="unknown_device">Périphérique inconnu</string>
-  <string name="error_not_reachable">Périphérique inaccessible</string>
-  <string name="error_already_requested">L\'appariement a déjà été demandé</string>
-  <string name="error_already_paired">Périphérique déjà apparié</string>
-  <string name="error_could_not_send_package">Il est impossible d\'envoyer un paquet</string>
-  <string name="error_timed_out">Délai expiré</string>
-  <string name="error_canceled_by_user">Annulé par l\'utilisateur</string>
-  <string name="error_canceled_by_other_peer">Annulé par un autre homologue</string>
-  <string name="error_invalid_key">Clé reçue non valable</string>
-  <string name="pair_requested">Paire demandée</string>
-  <string name="pairing_request_from">Demande d\'appariement provenant de %1s</string>
-  <string name="tap_to_answer">Cliquer pour répondre</string>
-  <string name="reconnect">Reconnecter</string>
-  <string name="device_not_paired">Périphérique non apparié</string>
-  <string name="request_pairing">Demande d\'appariement</string>
-  <string name="pairing_accept">Accepter</string>
-  <string name="pairing_reject">Rejeter</string>
-  <string name="device">Périphérique</string>
-  <string name="pair_device">Apparier un périphérique</string>
-  <string name="remote_control">Contrôle distant</string>
-  <string name="settings">Paramètres de connexion de KDE</string>
-  <string name="mpris_play">Lire</string>
-  <string name="mpris_previous">Précédent</string>
-  <string name="mpris_next">Suivant</string>
-  <string name="mpris_volume">Volume</string>
-</resources>
diff --git a/KdeConnect/src/main/res/values-ru/strings.xml b/KdeConnect/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 0a0ea36c..00000000
--- a/KdeConnect/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-  <string name="pref_plugin_telephony">Уведомления телефонии</string>
-  <string name="pref_plugin_telephony_desc">Отправлять уведомления о SMS и звонках</string>
-  <string name="pref_plugin_battery">Состояние батареи</string>
-  <string name="pref_plugin_battery_desc">Периодически сообщать о состоянии батареи</string>
-  <string name="pref_plugin_clipboard">Синхронизация буфера обмена</string>
-  <string name="pref_plugin_clipboard_desc">Сделать содержимое буфера обмена общим</string>
-  <string name="pref_plugin_mpris">ДУ для мультимедия</string>
-  <string name="pref_plugin_mpris_desc">Управление аудио/видео с устройства</string>
-  <string name="pref_plugin_ping">Пинг</string>
-  <string name="pref_plugin_ping_desc">Посылать и получать пинги</string>
-  <string name="pref_plugin_notifications">Синхронизация уведомлений</string>
-  <string name="pref_plugin_notifications_desc">Доступ к уведомлениям с других устройств</string>
-  <string name="plugin_not_available">Этот функционал недоступен в вашей версии Android</string>
-  <string name="device_list_empty">Нет устройств</string>
-  <string name="ok">OK</string>
-  <string name="cancel">Отмена</string>
-  <string name="open_settings">Открыть настройки</string>
-  <string name="no_permissions">Вы должны разрешить доступ к уведомлениям</string>
-  <string name="send_ping">Послать пинг</string>
-  <string name="open_mpris_controls">Открыть дистанционное управление</string>
-  <string name="category_connected_devices">Подключённые устройства</string>
-  <string name="category_not_paired_devices">Не спаренные устройства</string>
-  <string name="category_remembered_devices">Запомненные устройства</string>
-  <string name="plugins_failed_to_load">Сбой загрузки следующих модулей (прикоснитесь чтобы получить подробности):</string>
-  <string name="device_menu_plugins">Выбрать модули</string>
-  <string name="device_menu_unpair">Разделить спаренные устройства</string>
-  <string name="unknown_device">Неизвестное устройство</string>
-  <string name="error_not_reachable">Устройство недоступно</string>
-  <string name="error_already_requested">Запрос на спаривание уже был сделан</string>
-  <string name="error_already_paired">Устройство уже спарено</string>
-  <string name="error_could_not_send_package">Не удалось послать пакет</string>
-  <string name="error_timed_out">Истекло время ожидания</string>
-  <string name="error_canceled_by_user">Отменено пользователем</string>
-  <string name="error_canceled_by_other_peer">Отменено другим участником</string>
-  <string name="error_invalid_key">Недопустимый получатель ключа</string>
-  <string name="pair_requested">Запрошено спаривание</string>
-  <string name="pairing_request_from">Запрос на спаривание от %1s</string>
-  <string name="tap_to_answer">Коснитесь чтобы ответить</string>
-  <string name="reconnect">Переподключить</string>
-  <string name="device_not_paired">Устройство не спарено</string>
-  <string name="request_pairing">Запросить спаривание</string>
-  <string name="pairing_accept">Принять</string>
-  <string name="pairing_reject">Отклонить</string>
-  <string name="device">Устройство</string>
-  <string name="pair_device">Спарить устройство</string>
-  <string name="remote_control">Дистанционное управление</string>
-  <string name="settings">Настройки KDE Connect</string>
-  <string name="mpris_play">Воспроизвести</string>
-  <string name="mpris_previous">Предыдущий</string>
-  <string name="mpris_next">Следующее</string>
-  <string name="mpris_volume">Громкость</string>
-  <string name="share_to">Сделать общим с...</string>
-  <string name="protocol_version_older">Это устройство использует старую версию протокола</string>
-  <string name="protocol_version_newer">Это устройство использует более свежую версию протокола</string>
-</resources>
diff --git a/build.gradle b/build.gradle
index efaa2bc8..49846d46 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,19 +9,19 @@ buildscript {
 
 apply plugin: 'android'
 
-dependencies {
-    compile "com.android.support:support-v4:18.0.+"
-    compile "com.android.support:appcompat-v7:18.0.+"
-    compile files('libs/mina-core-2.0.7.jar')
-    compile files('libs/slf4j-api-1.6.6.jar')
-}
-
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.1"
+    buildToolsVersion "18.1.1"
 
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 18
     }
 }
+
+dependencies {
+    compile "com.android.support:support-v4:18.0.+"
+    compile "com.android.support:appcompat-v7:18.0.+"
+    compile files('libs/mina-core-2.0.7.jar')
+    compile files('libs/slf4j-api-1.6.6.jar')
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c22dec0..d6925833 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Oct 29 15:58:14 CET 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
diff --git a/kdeconnect-android.iml b/kdeconnect-android.iml
index 6e4d5bf9..3c2c7554 100644
--- a/kdeconnect-android.iml
+++ b/kdeconnect-android.iml
@@ -21,7 +21,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/classes/debug" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
@@ -69,7 +69,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 18 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android 4.3 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="support-v4-18.0.0" level="project" />
     <orderEntry type="library" exported="" name="ComAndroidSupportAppcompatV71800.aar" level="project" />