Skip to content

Commit 8548de0

Browse files
author
Robert Henigan
authored
Merge pull request #1460 from smartdevicelink/feature/update_dependencies
Update gradle dependencies
2 parents 8eb70b4 + 1ec8214 commit 8548de0

8 files changed

Lines changed: 17 additions & 21 deletions

File tree

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
python3 ./generator/test/runner.py
4343
4444
- name: Codecov
45-
uses: codecov/codecov-action@v1.0.6
45+
uses: codecov/codecov-action@v1.0.13
4646
with:
4747
yml: ./codecov.yml

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.3.1'
10+
classpath 'com.android.tools.build:gradle:4.0.1'
1111

1212

1313
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Jan 20 22:30:48 EST 2019
1+
#Wed Aug 19 13:26:39 EDT 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

android/hello_sdl_android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55
defaultConfig {
66
applicationId "com.sdl.hellosdlandroid"
77
minSdkVersion 16
8-
targetSdkVersion 28
8+
targetSdkVersion 29
99
versionCode 1
1010
versionName "1.0"
1111
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -54,7 +54,7 @@ dependencies {
5454
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
5555
exclude group: 'com.android.support', module: 'support-annotations'
5656
})
57-
implementation 'androidx.appcompat:appcompat:1.0.0'
57+
implementation 'androidx.appcompat:appcompat:1.2.0'
5858
implementation project(path: ':sdl_android')
5959
testImplementation 'junit:junit:4.12'
6060
}

android/sdl_android/build.gradle

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
apply plugin: 'com.android.library'
2-
import org.apache.tools.ant.taskdefs.condition.Os
3-
42

53
android {
64
compileSdkVersion 29
@@ -48,13 +46,13 @@ dependencies {
4846
exclude group: 'com.android.support', module: 'support-annotations'
4947
})
5048
testImplementation 'junit:junit:4.12'
51-
testImplementation 'org.mockito:mockito-core:2.9.0'
49+
testImplementation 'org.mockito:mockito-core:3.0.0'
50+
androidTestImplementation 'org.mockito:mockito-core:3.0.0'
51+
androidTestImplementation 'org.mockito:mockito-android:3.0.0'
5252
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
53-
androidTestImplementation 'org.mockito:mockito-core:2.9.0'
54-
androidTestImplementation 'org.mockito:mockito-android:2.9.0'
55-
api 'androidx.annotation:annotation:1.0.0'
56-
api 'androidx.lifecycle:lifecycle-extensions:2.0.0'
57-
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
53+
api 'androidx.annotation:annotation:1.1.0'
54+
api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
55+
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0'
5856
}
5957

6058
buildscript {
@@ -63,7 +61,7 @@ buildscript {
6361
mavenCentral()
6462
}
6563
dependencies {
66-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
64+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
6765
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
6866
}
6967
}

hello_sdl_java/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ configurations {
1919
}
2020
dependencies {
2121
extraLibs fileTree(dir: 'libs', include: ['*.jar'])
22-
//testCompile group: 'junit', name: 'junit', version: '4.12'
2322
extraLibs project(path: ':sdl_java_se')
2423
configurations.implementation.extendsFrom(configurations.extraLibs)
25-
2624
}
2725
jar {
2826
from {

javaEE/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ configurations {
2727

2828
dependencies {
2929
extraLibs fileTree(dir: 'libs', include: ['*.jar'])
30-
extraLibs 'org.mongodb:bson:3.10.1'
31-
extraLibs 'androidx.annotation:annotation:1.0.0'
30+
extraLibs 'org.mongodb:bson:4.0.5'
31+
extraLibs 'androidx.annotation:annotation:1.1.0'
3232
extraLibs 'org.java-websocket:Java-WebSocket:1.3.9'
3333
extraLibs 'com.livio.taskmaster:taskmaster:0.3.0'
3434
configurations.api.extendsFrom(configurations.extraLibs)

javaSE/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ configurations {
2828

2929
dependencies {
3030
extraLibs fileTree(dir: 'libs', include: ['*.jar'])
31-
extraLibs 'org.mongodb:bson:3.10.1'
32-
extraLibs 'androidx.annotation:annotation:1.0.0'
31+
extraLibs 'org.mongodb:bson:4.0.5'
32+
extraLibs 'androidx.annotation:annotation:1.1.0'
3333
extraLibs 'org.java-websocket:Java-WebSocket:1.3.9'
3434
extraLibs 'com.livio.taskmaster:taskmaster:0.3.0'
3535
configurations.api.extendsFrom(configurations.extraLibs)

0 commit comments

Comments
 (0)