Merge pull request #1 from devicehive/refactoring

Refactoring

app/build.gradle

@@ -1,22 +1,19 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
+
 
     defaultConfig {
         applicationId "com.dataart.obd2"
-        minSdkVersion 18
-        targetSdkVersion 24
+        minSdkVersion 19
+        targetSdkVersion 27
         versionCode 1
         versionName "0.1"
-
         multiDexEnabled true
     }
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -27,20 +24,43 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    useLibrary 'org.apache.http.legacy'
+}
+
+ext {
+    devicehive = "3.1.2"
+    commons = "1.11"
+    rxandroid = "2.0.1"
+    rxjava = "2.1.7"
+    guava = "23.6-android"
+    gson = "2.8.2"
+    timber = "4.6.0"
+    support = "27.0.2"
+    gms = "11.8.0"
+    multidex = "1.0.2"
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.0.0'
-    compile 'com.android.support:design:24.0.0'
-    compile 'com.google.code.gson:gson:2.4'
-    compile 'com.jakewharton.timber:timber:2.7.1'
-    provided "org.projectlombok:lombok:1.12.6"
-    compile 'commons-codec:commons-codec:1.5'
-    compile 'com.google.android.gms:play-services:9.0.2'
-    compile 'io.reactivex:rxandroid:1.1.0'
-    compile 'com.google.guava:guava:19.0'
-
-    compile 'com.android.support:multidex:1.0.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation "com.android.support:appcompat-v7:${support}"
+    implementation "com.android.support:design:${support}"
+
+    implementation "com.google.code.gson:gson:${gson}"
+
+    implementation "com.jakewharton.timber:timber:${timber}"
+
+    implementation "commons-codec:commons-codec:${commons}"
+
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid}"
+    // Because RxAndroid releases are few and far between, it is recommended you also
+    // explicitly depend on RxJava's latest version for bug fixes and new features.
+    implementation "io.reactivex.rxjava2:rxjava:${rxjava}"
+
+    implementation "com.google.android.gms:play-services-location:${gms}"
+
+    implementation "com.google.guava:guava:${guava}"
+
+    implementation "com.github.devicehive:devicehive-java:${devicehive}"
+    implementation "com.android.support:multidex:${multidex}"
+
 }

app/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.dataart.obd2" >
+    package="com.dataart.obd2">
 
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!--Location access is necessary for BLE devices discovery under Android M-->
@@ -18,24 +18,16 @@
         <activity
             android:name="com.dataart.obd2.MainActivity"
             android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <service android:name=".obd2_gateway.OBD2Service" android:enabled="true"/>
-
         <service
-            android:name="com.dataart.android.devicehive.network.DeviceHiveApiService"
-            android:exported="false" />
-        <!-- ATTENTION: This was auto-generated to add Google Play services to your project for
-        App Indexing. See https://g.co/AppIndexing/AndroidStudio for more information. -->
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
+            android:name=".obd2_gateway.OBD2Service"
+            android:enabled="true" />
     </application>
 
 </manifest>