Skip to content

Commit 78e0768

Browse files
bilal-alsharifibilal-alsharifi
committed
Merge branch 'develop' into feature/issue_1448_generate_deprecated_javadoc
2 parents 3f38f16 + 8548de0 commit 78e0768

110 files changed

Lines changed: 1522 additions & 2432 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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

‎android/gradle/wrapper/gradle-wrapper.properties‎

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
}

‎android/sdl_android/src/androidTest/assets/json/GetVehicleData.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"fuelRange":true,
3333
"turnSignal":true,
3434
"electronicParkBrakeStatus":true,
35+
"gearStatus": true,
3536
"oemCustomVehicleDataName":true,
3637
"windowStatus": true
3738
}
@@ -172,6 +173,11 @@
172173
}
173174
],
174175
"oemCustomVehicleDataName":"oemCustomVehicleDataState",
176+
"gearStatus": {
177+
"userSelectedGear": "PARK",
178+
"transmissionType": "ELECTRIC_VARIABLE",
179+
"actualGear": "PARK"
180+
},
175181
"windowStatus": [
176182
{
177183
"location": {

‎android/sdl_android/src/androidTest/assets/json/StreamRPC.json‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"fuelRange":true,
3232
"turnSignal":true,
3333
"electronicParkBrakeStatus":true,
34+
"gearStatus": true,
3435
"oemCustomVehicleDataName":true,
3536
"windowStatus": true,
3637
"handsOffSteering": true
@@ -156,6 +157,10 @@
156157
"dataType":"VEHICLEDATA_HANDSOFFSTEERING",
157158
"resultCode":"SUCCESS"
158159
},
160+
"gearStatus":{
161+
"dataType":"VEHICLEDATA_GEARSTATUS",
162+
"resultCode":"SUCCESS"
163+
},
159164
"oemCustomVehicleDataName":{
160165
"oemCustomDataType":"oemCustomVehicleDataName",
161166
"resultCode":"SUCCESS"

‎android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"turnSignal":true,
3333
"electronicParkBrakeStatus":true,
3434
"handsOffSteering": true,
35+
"gearStatus": true,
3536
"oemCustomVehicleDataName":true,
3637
"windowStatus": true
3738
}
@@ -156,6 +157,10 @@
156157
"dataType":"VEHICLEDATA_HANDSOFFSTEERING",
157158
"resultCode":"SUCCESS"
158159
},
160+
"gearStatus":{
161+
"dataType":"VEHICLEDATA_GEARSTATUS",
162+
"resultCode":"SUCCESS"
163+
},
159164
"oemCustomVehicleDataName":{
160165
"oemCustomDataType":"oemCustomVehicleDataName",
161166
"resultCode":"SUCCESS"

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.smartdevicelink.managers;
22

33
import android.content.Context;
4+
45
import androidx.test.ext.junit.runners.AndroidJUnit4;
56

67
import com.livio.taskmaster.Taskmaster;
@@ -18,7 +19,6 @@
1819
import com.smartdevicelink.proxy.rpc.TemplateColorScheme;
1920
import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
2021
import com.smartdevicelink.proxy.rpc.enums.Language;
21-
import com.smartdevicelink.proxy.rpc.enums.Result;
2222
import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
2323
import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;
2424
import com.smartdevicelink.test.TestValues;
@@ -403,10 +403,6 @@ public void onFinished() {
403403
listenerCalledCounter++;
404404
}
405405

406-
@Override
407-
public void onError(int correlationId, Result resultCode, String info) {
408-
}
409-
410406
@Override
411407
public void onResponse(int correlationId, RPCResponse response) {
412408
}

0 commit comments

Comments
 (0)