Skip to content

Commit bbbf616

Browse files
richiwarerichiware
authored
Update to gradle 9 (#550)
* Refs #24011 Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #24011. Update java versions Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #24011. Print java Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #24011. Fix Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #24011. Free space Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #24011. Fix Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #24011. Update thirdparty Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 6d6bc7c commit bbbf616

File tree

11 files changed

+213
-150
lines changed

11 files changed

+213
-150
lines changed

‎.github/workflows/config/build.meta‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
names:
22
fastdds:
33
cmake-args:
4-
- "-DEPROSIMA_BUILD_TESTS=ON"
4+
- -DEPROSIMA_BUILD_TESTS=ON
55
fastdds_python:
66
cmake-args:
7-
- "-DBUILD_TESTING=ON"
7+
- -DBUILD_TESTING=ON
8+
- -DCMAKE_CXX_FLAGS_INIT="-Wall"
9+
fastdds_python_examples:
10+
cmake-args:
11+
- -DCMAKE_CXX_FLAGS_INIT="-Wall"

‎.github/workflows/nightly-ubuntu-ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
java-version:
14-
- 'openjdk-11-jdk'
15-
- 'openjdk-19-jdk'
14+
- 'openjdk-17-jdk'
15+
- 'openjdk-21-jdk'
1616
uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@master
1717
with:
1818
os-version: 'ubuntu-22.04'
@@ -32,8 +32,8 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
java-version:
35-
- 'openjdk-11-jdk'
36-
- 'openjdk-19-jdk'
35+
- 'openjdk-17-jdk'
36+
- 'openjdk-21-jdk'
3737
uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@4.1.x
3838
with:
3939
os-version: 'ubuntu-22.04'
@@ -53,8 +53,8 @@ jobs:
5353
fail-fast: false
5454
matrix:
5555
java-version:
56-
- 'openjdk-11-jdk'
57-
- 'openjdk-19-jdk'
56+
- 'openjdk-17-jdk'
57+
- 'openjdk-21-jdk'
5858
uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@4.0.x
5959
with:
6060
os-version: 'ubuntu-22.04'
@@ -74,8 +74,8 @@ jobs:
7474
fail-fast: false
7575
matrix:
7676
java-version:
77-
- 'openjdk-11-jdk'
78-
- 'openjdk-19-jdk'
77+
- 'openjdk-17-jdk'
78+
- 'openjdk-21-jdk'
7979
fastcdr-branch:
8080
- '1.1.x'
8181
- '2.x'

‎.github/workflows/reusable-ubuntu-ci.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ jobs:
8989
number: ${{ github.event.number }}
9090
repo: eProsima/Fast-DDS-Gen
9191

92+
- name: Free disk space
93+
uses: eProsima/eProsima-CI/ubuntu/free_disk_space@v0
94+
9295
- name: Sync eProsima/Fast-DDS-Gen repository
9396
uses: eProsima/eProsima-CI/external/checkout@v0
9497
with:
@@ -115,6 +118,14 @@ jobs:
115118
run: |
116119
jv=$(echo ${{ inputs.java-version }} | sed -r 's/.*-([0-9]*)-.*/\1/g'); jvs=$(update-alternatives --list java | grep "$jv" | head -1); sudo update-alternatives --set java "$jvs"
117120
jv=$(echo ${{ inputs.java-version }} | sed -r 's/.*-([0-9]*)-.*/\1/g'); jvs=$(update-alternatives --list javac | grep "$jv" | head -1); sudo update-alternatives --set javac "$jvs"
121+
export JAVA_HOME=$(dirname $(dirname `readlink -f /etc/alternatives/java`))
122+
echo JAVA_HOME="$JAVA_HOME" >> $GITHUB_ENV
123+
124+
- name: Verify Java version
125+
run: |
126+
java -version
127+
javac --version
128+
echo $JAVA_HOME
118129
119130
- name: Install colcon
120131
uses: eProsima/eProsima-CI/multiplatform/install_colcon@v0
@@ -216,7 +227,7 @@ jobs:
216227

217228
- name: Colcon build
218229
continue-on-error: false
219-
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
230+
uses: eProsima/eProsima-CI/ubuntu/colcon_build@v0
220231
with:
221232
colcon_meta_file: ${{ github.workspace }}/src/fastddsgen/.github/workflows/config/build.meta
222233
colcon_build_args_default: '--event-handlers=console_direct+'

‎.github/workflows/ubuntu-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
fail-fast: false
5757
matrix:
5858
java-version:
59-
- 'openjdk-11-jdk'
60-
- 'openjdk-19-jdk'
59+
- 'openjdk-17-jdk'
60+
- 'openjdk-21-jdk'
6161

6262
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
6363
uses: ./.github/workflows/reusable-ubuntu-ci.yml

‎.github/workflows/weekly-ubuntu-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@2.1.x
1111
with:
1212
os-version: 'ubuntu-20.04'
13-
java-version: 'openjdk-11-jdk'
13+
java-version: 'openjdk-17-jdk'
1414
label: 'weekly-ubuntu-ci-2.1.x'
1515
fastddsgen-branch: '2.1.x'
1616
fastdds-branch: '2.6.x'

‎build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2016-2020 Proyectos y Sistemas de Mantenimiento SL (eProsima).
1+
// Copyright 2016-2025 Proyectos y Sistemas de Mantenimiento SL (eProsima).
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -92,13 +92,13 @@ repositories {
9292

9393
dependencies {
9494
implementation files('thirdparty/idl-parser/build/libs/idlparser-4.2.0.jar')
95-
testImplementation('org.junit.jupiter:junit-jupiter-api:5.5.2')
96-
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.5.2')
95+
testImplementation('org.junit.jupiter:junit-jupiter:5.14.1')
96+
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
9797
}
9898

9999
task submodulesUpdate(type: Exec) {
100-
description 'Updates (and inits) git submodules'
101-
commandLine 'git', 'submodule', 'update', '--init'
100+
description = 'Updates (and inits) git submodules'
101+
commandLine = ['git', 'submodule', 'update', '--init']
102102
}
103103

104104
task buildIDLParser(type: GradleBuild) {
@@ -146,7 +146,7 @@ sourceSets {
146146
}
147147

148148
jar {
149-
duplicatesStrategy 'exclude'
149+
duplicatesStrategy = 'exclude'
150150
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
151151
archiveBaseName = 'fastddsgen'
152152
manifest {

‎gradle/wrapper/gradle-wrapper.jar‎

2.6 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)