Merge pull request #1460 from smartdevicelink/feature/update_dependencies

Update gradle dependencies

8 files changed, 17 insertions, 21 deletions

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index c2ec6bf32..696200b8c 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -42,6 +42,6 @@ jobs:
         python3 ./generator/test/runner.py
 
     - name: Codecov	
-      uses: codecov/codecov-action@v1.0.6
+      uses: codecov/codecov-action@v1.0.13
       with:
         yml: ./codecov.yml
diff --git a/android/build.gradle b/android/build.gradle
index f94362a81..7ecff6a6a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 567cd660e..6691197d2 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 20 22:30:48 EST 2019
+#Wed Aug 19 13:26:39 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/android/hello_sdl_android/build.gradle b/android/hello_sdl_android/build.gradle
index 3e3a83528..f990b38e6 100755
--- a/android/hello_sdl_android/build.gradle
+++ b/android/hello_sdl_android/build.gradle
@@ -5,7 +5,7 @@ android {
     defaultConfig {
         applicationId "com.sdl.hellosdlandroid"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -54,7 +54,7 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation project(path: ':sdl_android')
     testImplementation 'junit:junit:4.12'
 }
\ No newline at end of file
diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
index 100a266ca..d35b06c49 100644
--- a/android/sdl_android/build.gradle
+++ b/android/sdl_android/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.library'
-import org.apache.tools.ant.taskdefs.condition.Os
-
 
 android {
     compileSdkVersion 29
@@ -48,13 +46,13 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.9.0'
+    testImplementation 'org.mockito:mockito-core:3.0.0'
+    androidTestImplementation 'org.mockito:mockito-core:3.0.0'
+    androidTestImplementation 'org.mockito:mockito-android:3.0.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'org.mockito:mockito-core:2.9.0'
-    androidTestImplementation 'org.mockito:mockito-android:2.9.0'
-    api 'androidx.annotation:annotation:1.0.0'
-    api 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
+    api 'androidx.annotation:annotation:1.1.0'
+    api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0'
 }
 
 buildscript {
@@ -63,7 +61,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
diff --git a/hello_sdl_java/build.gradle b/hello_sdl_java/build.gradle
index b4f834b43..ce0689640 100644
--- a/hello_sdl_java/build.gradle
+++ b/hello_sdl_java/build.gradle
@@ -19,10 +19,8 @@ configurations {
 }
 dependencies {
     extraLibs fileTree(dir: 'libs', include: ['*.jar'])
-    //testCompile group: 'junit', name: 'junit', version: '4.12'
     extraLibs project(path: ':sdl_java_se')
     configurations.implementation.extendsFrom(configurations.extraLibs)
-
 }
 jar {
     from {
diff --git a/javaEE/build.gradle b/javaEE/build.gradle
index a07678dd5..c65af1324 100644
--- a/javaEE/build.gradle
+++ b/javaEE/build.gradle
@@ -27,8 +27,8 @@ configurations {
 
 dependencies {
     extraLibs fileTree(dir: 'libs', include: ['*.jar'])
-    extraLibs 'org.mongodb:bson:3.10.1'
-    extraLibs 'androidx.annotation:annotation:1.0.0'
+    extraLibs 'org.mongodb:bson:4.0.5'
+    extraLibs 'androidx.annotation:annotation:1.1.0'
     extraLibs 'org.java-websocket:Java-WebSocket:1.3.9'
     extraLibs 'com.livio.taskmaster:taskmaster:0.3.0'
     configurations.api.extendsFrom(configurations.extraLibs)
diff --git a/javaSE/build.gradle b/javaSE/build.gradle
index 9e9b5596a..b056fe7a0 100644
--- a/javaSE/build.gradle
+++ b/javaSE/build.gradle
@@ -28,8 +28,8 @@ configurations {
 
 dependencies {
     extraLibs fileTree(dir: 'libs', include: ['*.jar'])
-    extraLibs 'org.mongodb:bson:3.10.1'
-    extraLibs 'androidx.annotation:annotation:1.0.0'
+    extraLibs 'org.mongodb:bson:4.0.5'
+    extraLibs 'androidx.annotation:annotation:1.1.0'
     extraLibs 'org.java-websocket:Java-WebSocket:1.3.9'
     extraLibs 'com.livio.taskmaster:taskmaster:0.3.0'
     configurations.api.extendsFrom(configurations.extraLibs)