Skip to content

Commit 9d7345d

Browse files
committed
Merge branch 'release/4.6.0_RC'
2 parents 77e11d3 + 9fe43d5 commit 9d7345d

File tree

162 files changed

+9718
-1084
lines changed

Some content is hidden

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

162 files changed

+9718
-1084
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android:
1010
- ndk-bundle
1111

1212
# The BuildTools version used by your project
13-
- build-tools-25.0.3
13+
- build-tools-27.0.3
1414

1515
# The SDK version used to compile your project
1616
- android-26
@@ -43,10 +43,10 @@ before_script:
4343

4444
script:
4545
- android list target
46-
- ./gradlew connectedAndroidTest
46+
- ./gradlew connectedCheck
4747

4848
before_install:
49-
- pip install --user codecov #Install codecov
49+
- echo yes | sdkmanager "build-tools;27.0.3"
5050

5151
after_success:
52-
- codecov #Run codecov
52+
- bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
# 4.5.0 Release Notes
1+
# 4.6.0 Release Notes
22

33
### API New Features & Breaking Changes
4-
- **IMPORTANT:** `SdlRouterService` manifest declarations now require an `intent-filter` and `meta-data` tags. These changes can be found in the documentation.
5-
- Now targeting version 26 to make use of new Android Oreo features.
6-
- Most broadcast intents are now sent explicitly instead of implicitly
7-
- Added methods to send a batch of RPCs. This includes chaining RPC messages or sending them all at once
4+
- `RPCRequestFactory` has been deprecated. Please use the desired RPC's constructor instead.
5+
- The Android Annotations Library has been added to the project to better help and inform developers about the SDK.
86

97
### Enhancements
10-
- Added method calls to retrieve `pcmCapabilities` from the `SystemCapbilityManager`
11-
- `SdlRouterService` had a good deal of refactoring and cleaning up to remove warnings and issues
12-
- Created a new way to retrieve the library version from apps.
13-
- Version checking for `SdlRouterService` is now performed before starting an actual router service.
14-
- General enhancements and stability fixes to the multiplexing transport feature
8+
- The router service foreground lifecycle is improved. The notification should no longer be seen when connecting to non-SDL devices.
9+
- The SDL notification now links to a webpage to explain what the notification is and how to hide it.
10+
- The required `intent-filter` entires for the `SdlBroadcastReceiver` has been reduced. It is now only listening for the SDL custom intent, ACL connect, and USB connection if using AOA.
11+
- RPC classes now contain constructors with the required parameters for that RPC.
12+
- Moved project to newer version of Gradle. Updated configurations including from `compile` to `api` and `implementation`.
13+
- `SdlProxyBuilder` was cleaned up to remove redundant variables between the `SdlProxyBuilder.Builder` object and the `SdlProxyBuilder` class.
1514

1615
### Bug Fixes
17-
- Fixed a potential deadlock within the `LegacyBluetoothTransport`
18-
- Fix issue with video streaming not being able to restart after being stopped
19-
- Fixed issue where `OnHMIStatus` was ignored if the level was the same, but the `AudioStreamingState` had changed
20-
- Fixed potential NPE in the `SdlProxyBase` class when a packet was malformed
21-
- Fixed issue that would incorrectly unregister apps from the module through the router service when apps are being force closed and others register
22-
- Fixed issue in `SdlRouterStatusProvider` class where the handler wasn't able to obtain a looper.
23-
- Fixed issue in `ServiceFinder` class where the handler was using a looper than was exiting and therefore not posting the expected runnable
24-
- Fixed an issue that kept the `SdlRouterService` notification icon showing even if there were no current connects
25-
- Fixed an issue where the `SdlRouterService` would start regardless of what bluetooth device it connected.
26-
- `UsbTransport` was given a few fixes around incorrect exiting calls
27-
- Fixed an issue found with some modules where they would return a single `SpeechCapability` instead of a list
16+
- Fixed touch issues with the video streaming feature. A new module was added to handle touch events much more aligned with Android native views.
17+
- Fixed JavaDoc issue in `UnregisterAppInterface`.
18+
- Fixed JavaDoc issue in `AddCommand`.
19+
- Added tags to the string resource xml file to ignore translation
20+
- Temporary fix to the TCP transport to catch `NetworkOnTheMainThread` exceptions when the connection is closing.
21+
- Fix issue where the `SdlBroadcastReceiver` was attempting to send implicit intents to ping the `SdlRouterService`. They are now explicit.
22+
- Fix a potential NPE in the `SdlBroadcastReceiver` while an app is only using USB and does not include an instance of an `SdlRouterService`.
23+
- Removed reflection usage in bluetooth transports when operating on systems that are newer than Android Oreo in anticipation of Android P.
24+
- Fix an issue where the `SdlBroadcastReceiver` would throw a false positive regarding whether or not an app had included the correct `intent-filter` in their `SdlRouterService` manifest declaration.

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ You can also find some branches that have yet to be merged into this GitHub proj
3030

3131
#### Dependency Managers
3232

33-
To compile with the a release of SDL Android, include the following in your app's `build.gradle` file,
33+
To compile with the latest release of SDL Android, include the following in your app's `build.gradle` file,
3434

3535
```
3636
repositories {
3737
jcenter()
3838
}
3939
dependencies {
40-
compile 'com.smartdevicelink:sdl_android:4.+'
40+
implementation 'com.smartdevicelink:sdl_android:4.+'
4141
}
4242
```
4343

@@ -46,3 +46,12 @@ For Maven or Ivy snippets please look at [Bintray](https://bintray.com/smartdevi
4646
#### Manually
4747

4848
If you prefer not to use any of the aforementioned dependency managers, you can integrate SDL Android into your project manually.
49+
50+
### Proguard Rules
51+
52+
Developers using Proguard to shrink and obfuscate their code should be sure to include the following lines in their proguard-rules.pro file:
53+
54+
```
55+
-keep class com.smartdevicelink.** { *; }
56+
-keep class com.livio.** { *; }
57+
```

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
45
repositories {
6+
google()
57
jcenter()
68
}
79
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.0'
10+
classpath 'com.android.tools.build:gradle:3.1.3'
11+
912

1013
// NOTE: Do not place your application dependencies here; they belong
1114
// in the individual module build.gradle files
@@ -14,10 +17,11 @@ buildscript {
1417

1518
allprojects {
1619
repositories {
20+
google()
1721
jcenter()
1822
}
1923
}
2024

2125
task clean(type: Delete) {
2226
delete rootProject.buildDir
23-
}
27+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Mar 22 15:16:37 EDT 2017
1+
#Sun Apr 8 12:14:33 EDT 2018
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-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

sdl_android/bintray.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bintray {
5151
// Authorization
5252
user = props.getProperty("bintray.user")
5353
key = props.getProperty("bintray.key")
54-
54+
version = props.getProperty("bintray.version")
5555
configurations = ['archives']
5656
pkg {
5757
repo = props.getProperty("bintray.repo")

sdl_android/build.gradle

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 26
5-
buildToolsVersion "25.0.3"
65
defaultConfig {
76
minSdkVersion 8
87
targetSdkVersion 19
9-
versionCode 3
10-
versionName "4.5.0"
8+
versionCode 4
9+
versionName "RC_4.6.0"
1110
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1211
resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
1312
}
@@ -34,16 +33,14 @@ android {
3433
}
3534

3635
dependencies {
37-
compile fileTree(dir: 'libs', include: ['*.jar'])
38-
compile ('com.smartdevicelink:bson_java_port:1.0.0@aar'){
39-
transitive = true
40-
}
41-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
36+
api fileTree(dir: 'libs', include: ['*.jar'])
37+
api 'com.smartdevicelink:bson_java_port:1.1.1'
38+
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
4239
exclude group: 'com.android.support', module: 'support-annotations'
4340
})
44-
testCompile 'junit:junit:4.12'
45-
testCompile 'org.mockito:mockito-core:2.9.0'
46-
41+
testImplementation 'junit:junit:4.12'
42+
testImplementation 'org.mockito:mockito-core:2.9.0'
43+
api 'com.android.support:support-annotations:27.1.1'
4744
}
4845

4946
buildscript {
@@ -52,11 +49,9 @@ buildscript {
5249
mavenCentral()
5350
}
5451
dependencies {
55-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
56-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
57-
classpath 'com.trickyandroid:jacoco-everywhere:0.2.1'
52+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
53+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
5854
}
5955
}
6056

61-
apply from: 'bintray.gradle'
62-
apply plugin: 'jacoco-everywhere'
57+
apply from: 'bintray.gradle'

0 commit comments

Comments
 (0)