diff --git a/app/build.gradle b/app/build.gradle
index 2b1dafd2..214710df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "org.flyve.admin.dashboard"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/org/flyve/admin/dashboard/ui/DashboardAgent.java b/app/src/main/java/org/flyve/admin/dashboard/ui/DashboardAgent.java
index 671d5be3..f7d3d93f 100644
--- a/app/src/main/java/org/flyve/admin/dashboard/ui/DashboardAgent.java
+++ b/app/src/main/java/org/flyve/admin/dashboard/ui/DashboardAgent.java
@@ -30,7 +30,6 @@
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.support.multidex.MultiDex;
 import android.util.Log;
 
 import com.orhanobut.logger.AndroidLogAdapter;
@@ -39,6 +38,9 @@
 import com.orhanobut.logger.PrettyFormatStrategy;
 
 import org.flyve.admin.dashboard.data.DataStorage;
+import org.glpi.api.GLPI;
+
+import androidx.multidex.MultiDex;
 
 /**
  * All the application configuration
diff --git a/app/src/main/java/org/flyve/admin/dashboard/ui/DeviceDetailActivity.java b/app/src/main/java/org/flyve/admin/dashboard/ui/DeviceDetailActivity.java
index 14c40f34..fc1393a7 100644
--- a/app/src/main/java/org/flyve/admin/dashboard/ui/DeviceDetailActivity.java
+++ b/app/src/main/java/org/flyve/admin/dashboard/ui/DeviceDetailActivity.java
@@ -10,7 +10,6 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 
 import android.telephony.SmsManager;
 import android.text.TextUtils;
@@ -40,6 +39,7 @@
 import java.util.List;
 
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
diff --git a/build.gradle b/build.gradle
index 94888ce1..6579dd2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,15 +4,13 @@ buildscript {
     repositories {
         jcenter()
         google()
-        maven{
-            url "https://dl.bintray.com/glpi-project/maven-repository"
-        }
+
 
     }
     dependencies {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -23,6 +21,9 @@ allprojects {
     repositories {
         jcenter()
         google()
+        maven{
+            url "https://dl.bintray.com/glpi-project/maven-repository"
+        }
     }
 }
 
diff --git a/glpi/build.gradle b/glpi/build.gradle
index 04dab8eb..b62f6de8 100644
--- a/glpi/build.gradle
+++ b/glpi/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         setProperty("archivesBaseName", "glpi-api-client")
diff --git a/glpi/src/main/java/org/glpi/api/GLPI.java b/glpi/src/main/java/org/glpi/api/GLPI.java
index c9033b67..57659287 100644
--- a/glpi/src/main/java/org/glpi/api/GLPI.java
+++ b/glpi/src/main/java/org/glpi/api/GLPI.java
@@ -27,7 +27,6 @@
 package org.glpi.api;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.google.gson.JsonArray;
@@ -50,6 +49,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
diff --git a/gradle.properties b/gradle.properties
index 417f1843..61aad666 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,12 +10,13 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-
+android.useAndroidX = true
+android.enableJetifier = true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-glpi_user=
-glpi_password=
-glpi_url=
+ glpi_user=
+ glpi_password=
+ glpi_url=
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 894ad3f4..dc55e041 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Thu Nov 22 09:40:50 CET 2018
+#Thu Jan 03 12:00:55 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
diff --git a/test.txt b/test.txt
new file mode 100644
index 00000000..9daeafb9
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+test