Skip to content

Commit b49b23e

Browse files
authored
Prep grpc client generation (eclipse-velocitas#7)
* Add Tag and Verbose to Logger (cherry picked from commit c8999eb9edbffa6a41244c339ba49f9a3236fb19) # Conflicts: # app/src/main/java/com/example/service/GrpcCarService.kt * Add LogcatLoggingStrategy (cherry picked from commit 11a7e8c2e8e63773e30dc736698f6deea76b0785) * Add Custom VehicleApp Class (cherry picked from commit c16219626daee0a31493874d83e03744b1f2e738) * Add PUML Documentation * Update kuksa.val.v2 proto * Rename App to SampleApp * Add Main Pipeline * Adapt Proto Files * Align Java and Kotlin JavaVersion Increased Sample App JavaVersion from Java 8 to Java 11 because Java 11 is slowly fading out. * Align some IntelliJ Files * Adapt Build Pipeline to build with Java 21 * Add missing Import
1 parent 279fa9d commit b49b23e

File tree

57 files changed

+986
-459
lines changed

Some content is hidden

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

57 files changed

+986
-459
lines changed

.github/workflows/build-main.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Build Main
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build-project:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v4
14+
15+
- uses: actions/setup-java@v4
16+
with:
17+
distribution: 'temurin'
18+
java-version: '21'
19+
20+
- name: Setup Gradle
21+
uses: gradle/actions/setup-gradle@v4
22+
23+
- name: Run 'assemble' with Gradle Wrapper
24+
run: ./gradlew assemble
25+
26+
- name: Run 'check' with Gradle Wrapper
27+
run: ./gradlew check
28+
29+
- name: Upload Detekt Reports
30+
if: always()
31+
uses: actions/upload-artifact@v4
32+
with:
33+
name: detekt
34+
path: ${{ github.workspace }}/build/reports/detekt
35+
if-no-files-found: error
36+
37+
- name: Upload Test Reports
38+
if: always()
39+
uses: actions/upload-artifact@v4
40+
with:
41+
name: test
42+
path: ${{ github.workspace }}/**/build/reports/tests/test
43+
if-no-files-found: error
44+
45+
- name: Upload Velocitas SDK
46+
if: always()
47+
uses: actions/upload-artifact@v4
48+
with:
49+
name: Velocitas SDK
50+
path: ${{ github.workspace }}/sdk/build/libs/sdk.jar

.github/workflows/build-pull-request.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: Validate Pull Request
22

33
on:
4-
pull_request
4+
- pull_request
5+
56

67
jobs:
78
build-project:
@@ -13,10 +14,10 @@ jobs:
1314
- uses: actions/setup-java@v4
1415
with:
1516
distribution: 'temurin'
16-
java-version: '17'
17+
java-version: '21'
1718

1819
- name: Setup Gradle
19-
uses: gradle/gradle-build-action@v3
20+
uses: gradle/actions/setup-gradle@v4
2021

2122
- name: Run 'assemble' with Gradle Wrapper
2223
run: ./gradlew assemble
@@ -31,7 +32,6 @@ jobs:
3132
name: detekt
3233
path: ${{ github.workspace }}/build/reports/detekt
3334
if-no-files-found: error
34-
retention-days: 14
3535

3636
- name: Upload Test Reports
3737
if: always()
@@ -40,4 +40,11 @@ jobs:
4040
name: test
4141
path: ${{ github.workspace }}/**/build/reports/tests/test
4242
if-no-files-found: error
43-
retention-days: 14
43+
44+
45+
- name: Upload Velocitas SDK
46+
if: always()
47+
uses: actions/upload-artifact@v4
48+
with:
49+
name: Velocitas SDK
50+
path: ${{ github.workspace }}/sdk/build/libs/sdk.jar

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/other.xml

Lines changed: 0 additions & 252 deletions
This file was deleted.
File renamed without changes.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ android {
4444
}
4545
}
4646
compileOptions {
47-
sourceCompatibility = JavaVersion.VERSION_1_8
48-
targetCompatibility = JavaVersion.VERSION_1_8
47+
sourceCompatibility = JavaVersion.VERSION_11
48+
targetCompatibility = JavaVersion.VERSION_11
4949
}
5050
kotlinOptions {
51-
jvmTarget = "1.8"
51+
jvmTarget = "11"
5252
}
5353
}
5454

0 commit comments

Comments
 (0)