Skip to content

Commit 5f4c890

Browse files
Merge branch 'develop' into feature/Image_upload_management
# Conflicts: # android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java # javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
2 parents 5f95808 + f8a9b32 commit 5f4c890

51 files changed

Lines changed: 2409 additions & 360 deletions

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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: GitHub CI
22

3-
on: [push]
3+
on: [push, pull_request]
44

55
jobs:
66
test:
77
runs-on: macOS-latest
88
steps:
99

1010
- name: Checkout
11-
uses: actions/checkout@v1
11+
uses: actions/checkout@v2
1212

1313
- name: Setup JDK
1414
uses: actions/setup-java@v1
@@ -17,7 +17,7 @@ jobs:
1717

1818
- name: Sdl Android Tests
1919
# For more info, please check out: https://github.com/marketplace/actions/android-emulator-runner
20-
uses: reactivecircus/android-emulator-runner@v1
20+
uses: reactivecircus/android-emulator-runner@v2
2121
with:
2222
api-level: 29
2323
script: ./android/gradlew -p ./android :sdl_android:connectedCheck
@@ -35,7 +35,6 @@ jobs:
3535
run: ./javaEE/gradlew -p ./javaEE test
3636

3737
- name: Codecov
38-
uses: codecov/codecov-action@v1.0.4
38+
uses: codecov/codecov-action@v1.0.6
3939
with:
40-
token: ${{secrets.CODECOV_TOKEN}}
4140
yml: ./codecov.yml

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
1+
Copyright (c) 2017 - 2020, SmartDeviceLink Consortium, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)