Skip to content

Commit 0a1a453

Browse files
joeygroverjoeygrover
authored
Merge pull request #1890 from smartdevicelink/release/5.8.0_RC
Release 5.8.0
2 parents cc45527 + 3a8121d commit 0a1a453

25 files changed

+195
-111
lines changed

‎.github/workflows/android.yml‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
44

55
jobs:
66
test_Android:
7-
runs-on: macOS-latest
7+
runs-on: ubuntu-latest
88
steps:
99

1010
- name: Checkout
@@ -15,15 +15,29 @@ jobs:
1515
- name: Setup JDK
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 11
19-
20-
- name: Sdl Android Tests
21-
# For more info, please check out: https://github.com/marketplace/actions/android-emulator-runner
18+
java-version: 17
19+
20+
- name: Enable KVM group perms
21+
run: |
22+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
23+
sudo udevadm control --reload-rules
24+
sudo udevadm trigger --name-match=kvm
25+
ls -l /dev/kvm || true
26+
27+
- name: SDL Android Tests
2228
uses: reactivecircus/android-emulator-runner@v2
2329
with:
24-
api-level: 29
25-
script: ./android/gradlew -p ./android :sdl_android:connectedCheck
26-
30+
api-level: 36
31+
target: google_apis
32+
arch: x86_64
33+
profile: pixel_7
34+
ram-size: 2048M
35+
disk-size: 4096M
36+
disable-animations: true
37+
emulator-boot-timeout: 1200
38+
emulator-options: "-no-window -no-snapshot -no-audio"
39+
script: ./android/gradlew -p ./android :sdl_android:connectedDebugAndroidTest
40+
2741
- name: Hello Sdl Android Tests
2842
run: ./android/gradlew -p ./android/hello_sdl_android test
2943

@@ -33,7 +47,7 @@ jobs:
3347
yml: ./codecov.yml
3448

3549
test_Java:
36-
runs-on: macOS-latest
50+
runs-on: ubuntu-latest
3751
steps:
3852

3953
- name: Checkout

‎CHANGELOG.md‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,13 @@
1-
# 5.7.0 Release Notes
1+
# 5.8.0 Release Notes
22

33
## Summary:
44

55
|| Version|
66
|---|---|
77
| **Protocol** | 5.4.1 |
88
| **RPC** | 8.0.0 |
9-
| **Tested Targeting** | Android 34 |
9+
| **Tested Targeting** | Android 36 |
1010

1111
## Bug Fix / Enhancements:
1212

13-
- [Add pending intent to ping intents] (https://github.com/smartdevicelink/sdl_java_suite/pull/1844
14-
15-
- [Fixes #1845 typo in SdlBroadcastReceiver for uncaughtException handler](https://github.com/smartdevicelink/sdl_java_suite/pull/1846
16-
17-
- [Bugfix/issue #1842 - NPE in BaseTextAndGraphicsManager](https://github.com/smartdevicelink/sdl_java_suite/pull/1847
18-
19-
- [Fix case for UncaughtExceptionHandler in SdlBroadcastReceiver for RemoteServiceException](https://github.com/smartdevicelink/sdl_java_suite/pull/1849
20-
21-
- [Update gradle to 7.4.2](https://github.com/smartdevicelink/sdl_java_suite/pull/1853
22-
23-
- [Fix NPE in SdlRouterService](https://github.com/smartdevicelink/sdl_java_suite/pull/1870
24-
25-
- [Bugfix/issue 1867 Bluetooth notification error fix](https://github.com/smartdevicelink/sdl_java_suite/pull/1868
26-
27-
- [Clean LifecycleManager before closing](https://github.com/smartdevicelink/sdl_java_suite/pull/1866
28-
29-
- [Move router service message sending to its own thread](https://github.com/smartdevicelink/sdl_java_suite/pull/1871
30-
31-
- [Bugfix/issue 1863 update gradle build variants for hello_sdl](https://github.com/smartdevicelink/sdl_java_suite/pull/1864
32-
33-
- [Android 14 add package to PendingIntents in RouterService](https://github.com/smartdevicelink/sdl_java_suite/pull/1862
34-
35-
- [Android 14 Runtime registered broadcast receivers export behavior](https://github.com/smartdevicelink/sdl_java_suite/pull/1858
36-
37-
- [Add logic to handle RAI response failure](https://github.com/smartdevicelink/sdl_java_suite/pull/1873
38-
39-
- [Android 14 foreground service type required](https://github.com/smartdevicelink/sdl_java_suite/pull/1860
40-
41-
- [Update integration validator with latest permissions and checks for exported](https://github.com/smartdevicelink/sdl_java_suite/pull/1875
42-
43-
- [Fix SDLLockScreenActivityEspressoTest for newer devices](https://github.com/smartdevicelink/sdl_java_suite/pull/1877
44-
45-
- [Remove only app logic for device listener start](https://github.com/smartdevicelink/sdl_java_suite/pull/1879)
46-
47-
- [Fix NPE in TransportBroker](https://github.com/smartdevicelink/sdl_java_suite/pull/1882)
48-
49-
**Full Changelog**: https://github.com/smartdevicelink/sdl_java_suite/compare/5.6.1...RC_5.7.0
13+
- [Update to gradle version 8.13 and target API level 36] (https://github.com/smartdevicelink/sdl_java_suite/pull/1886)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.7.0
1+
5.8.0

‎android/build.gradle‎

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

1212

1313
// NOTE: Do not place your application dependencies here; they belong

‎android/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
1212
android.enableJetifier=true
13+
android.defaults.buildfeatures.buildconfig=true
14+
android.nonFinalResIds=false
15+
android.nonTransitiveRClass=false
1316
android.useAndroidX=true
1417
org.gradle.jvmargs=-Xmx1536m
1518

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

‎android/hello_sdl_android/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 34
4+
compileSdkVersion 36
55
defaultConfig {
66
applicationId "com.sdl.hellosdlandroid"
7-
minSdkVersion 16
8-
targetSdkVersion 34
7+
minSdkVersion 21
8+
targetSdkVersion 36
99
versionCode 1
1010
versionName "1.0"
1111
resValue "string", "app_name", "Hello Sdl Android"
@@ -61,6 +61,7 @@ android {
6161
lintOptions {
6262
disable 'GoogleAppIndexingWarning'
6363
}
64+
namespace 'com.sdl.hellosdlandroid'
6465
}
6566

6667

@@ -69,7 +70,7 @@ dependencies {
6970
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
7071
exclude group: 'com.android.support', module: 'support-annotations'
7172
})
72-
implementation 'androidx.appcompat:appcompat:1.2.0'
73+
implementation 'androidx.appcompat:appcompat:1.7.1'
7374
implementation project(path: ':sdl_android')
74-
testImplementation 'junit:junit:4.12'
75+
testImplementation 'junit:junit:4.13.2'
7576
}

‎android/hello_sdl_android/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.sdl.hellosdlandroid">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.BLUETOOTH" />
76
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"

‎android/sdl_android/build.gradle‎

Lines changed: 49 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,31 @@
1-
apply plugin: 'com.android.library'
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
}
5+
dependencies {
6+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
7+
}
8+
}
9+
10+
plugins {
11+
id "com.android.library"
12+
id "com.vanniktech.maven.publish" version "0.35.0"
13+
}
14+
15+
group = "com.smartdevicelink"
16+
version = file("../../VERSION").text.trim()
17+
18+
mavenPublishing {
19+
publishToMavenCentral()
20+
signAllPublications()
21+
}
222

323
android {
4-
compileSdkVersion 34
24+
compileSdkVersion 36
525
defaultConfig {
6-
minSdkVersion 16
7-
targetSdkVersion 34
8-
versionCode 26
26+
minSdkVersion 21
27+
targetSdkVersion 36
28+
versionCode 27
929
versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
1030
buildConfigField "String", "VERSION_NAME", '\"' + versionName + '\"'
1131
resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
@@ -38,35 +58,39 @@ android {
3858
main.java.srcDirs += '../../base/src/main/java'
3959
androidTest.assets.srcDirs += '../../generator/rpc_spec/'
4060
}
61+
62+
buildFeatures {
63+
aidl true
64+
}
65+
66+
namespace 'com.smartdevicelink'
67+
testNamespace 'com.smartdevicelink.test'
4168
}
4269

4370
ext { VERSION_NAME = "$project.android.defaultConfig.versionName" }
4471

4572
dependencies {
4673
api fileTree(dir: 'libs', include: ['*.jar'])
4774
//api 'com.livio.taskmaster:taskmaster:0.6.0'
48-
api 'com.smartdevicelink:bson_java_port:1.2.5'
75+
api 'com.smartdevicelink:bson_java_port:1.2.6'
4976
api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
50-
api 'androidx.annotation:annotation:1.1.0'
51-
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0'
77+
api 'androidx.annotation:annotation:1.9.1'
78+
annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.9.4'
5279

53-
testImplementation 'junit:junit:4.12'
54-
testImplementation 'org.mockito:mockito-core:5.7.0'
55-
androidTestImplementation 'org.mockito:mockito-core:5.7.0'
56-
androidTestImplementation 'org.mockito:mockito-android:5.7.0'
57-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
58-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
59-
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
80+
testImplementation 'junit:junit:4.13.2'
81+
testImplementation 'org.mockito:mockito-core:5.20.0'
82+
androidTestImplementation 'androidx.test:rules:1.7.0'
83+
androidTestImplementation 'org.mockito:mockito-core:5.20.0'
84+
androidTestImplementation 'org.mockito:mockito-android:5.20.0'
85+
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
86+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
87+
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.7.0'
6088
}
6189

62-
buildscript {
63-
repositories {
64-
mavenCentral()
65-
}
66-
dependencies {
67-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
68-
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
90+
afterEvaluate {
91+
tasks.named("sourceReleaseJar") {
92+
exclude { details ->
93+
details.file.toPath().toString().contains("/generated/")
94+
}
6995
}
70-
}
71-
72-
apply plugin: "com.vanniktech.maven.publish"
96+
}

‎android/sdl_android/gradle.properties‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@ POM_LICENCE_NAME=BSD 3-Clause
1616
POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
1717
POM_LICENCE_DIST=repo
1818

19-
RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
20-
SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
21-
2219
POM_DEVELOPER_ID=
2320
POM_DEVELOPER_NAME=
2421
POM_DEVELOPER_URL=
25-
26-
signing.keyId=
27-
signing.password=
28-
signing.secretKeyRingFile=
29-
SONATYPE_NEXUS_USERNAME=
30-
SONATYPE_NEXUS_PASSWORD=

0 commit comments

Comments
 (0)