Merge pull request #10 from dji-sdk/CI-94

Update build tools and dependencies

android-wsbridge/.gitignore

@@ -38,6 +38,7 @@ captures/
 
 # IntelliJ
 *.iml
+.idea/
 .idea/*.xml
 .idea/dictionaries
 .idea/libraries
@@ -65,3 +66,7 @@ Thumbs.db
 
 # OSX files
 .DS_Store
+
+.gradle/
+.gradle/buildOutputCleanup
+build/

android-wsbridge/app/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.24.3'
+        classpath 'io.fabric.tools:gradle:1.25.4'
     }
 }
 apply plugin: 'com.android.application'
@@ -17,7 +17,7 @@ repositories {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "26.0.2"
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.dji.wsbridge"
         minSdkVersion 16
@@ -43,25 +43,25 @@ android {
 }
 
 dependencies {
-    compile 'com.amitshekhar.android:android-networking:0.3.0'
-    compile 'org.java-websocket:java-websocket:1.3.3'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.squareup:otto:1.3.8'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
+    implementation 'com.amitshekhar.android:android-networking:0.3.0'
+    implementation 'org.java-websocket:java-websocket:1.3.3'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.squareup:otto:1.3.8'
+    implementation('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
         transitive = true;
     }
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
     // 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.
-    compile 'io.reactivex.rxjava2:rxjava:2.1.3'
-    compile 'com.android.support:support-annotations:25.0.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    internalCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    debugCompile 'com.github.markzhai:blockcanary-android:1.5.0'
-    internalCompile 'com.github.markzhai:blockcanary-android:1.5.0'
-    releaseCompile 'com.github.markzhai:blockcanary-no-op:1.5.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
+    implementation 'com.android.support:support-annotations:25.0.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
+    internalImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    debugImplementation 'com.github.markzhai:blockcanary-android:1.5.0'
+    internalImplementation 'com.github.markzhai:blockcanary-android:1.5.0'
+    releaseImplementation 'com.github.markzhai:blockcanary-no-op:1.5.0'
 }
 
 /**

android-wsbridge/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android-wsbridge/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Dec 06 22:50:27 PST 2017
+#Thu Aug 23 14:34:33 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip