Skip to content

Commit f9fe656

Browse files
committed
deps: Update Gradle Wrapper 9.2.0 to 9.2.1
- Update Gradle Wrapper to 9.2.1 and add checksum for validation - Refine GitHub Workflows to leverage the Gradle caching from the Setup Gradle action instead of Setup Java - Optimize Git checkout operations in GitHub Workflows so that only the current branch is downloaded. Signed-off-by: Thomas Vitale <[email protected]>
1 parent 5fe5b8f commit f9fe656

File tree

10 files changed

+118
-100
lines changed

10 files changed

+118
-100
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
name: jvm-build-test-${{ matrix.module }}-java${{ matrix.java }}
5454
steps:
5555
- uses: actions/checkout@v6
56+
with:
57+
fetch-depth: 0
5658

5759
- name: Reclaim disk space
5860
working-directory: .github
@@ -64,7 +66,6 @@ jobs:
6466
with:
6567
java-version: ${{ matrix.java }}
6668
distribution: temurin
67-
cache: gradle
6869

6970
- name: Setup Gradle
7071
uses: gradle/actions/setup-gradle@v5
@@ -86,6 +87,8 @@ jobs:
8687
- 25
8788
steps:
8889
- uses: actions/checkout@v6
90+
with:
91+
fetch-depth: 0
8992

9093
- name: Reclaim disk space
9194
working-directory: .github/scripts
@@ -97,7 +100,6 @@ jobs:
97100
with:
98101
java-version: ${{ matrix.java }}
99102
distribution: temurin
100-
cache: gradle
101103

102104
- name: Setup Gradle
103105
uses: gradle/actions/setup-gradle@v5
@@ -137,7 +139,9 @@ jobs:
137139
with:
138140
java-version: 25
139141
distribution: temurin
140-
cache: gradle
142+
143+
- name: Setup Gradle
144+
uses: gradle/actions/setup-gradle@v5
141145

142146
- name: Generate documentation
143147
run: ./gradlew --console=plain clean :docs:build

.github/workflows/dependency-submission.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
steps:
1515
- name: Checkout sources
1616
uses: actions/checkout@v6
17+
with:
18+
fetch-depth: 0
1719

1820
- name: Setup Java
1921
uses: actions/setup-java@v5

.github/workflows/docs.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
url: ${{ steps.deployment.outputs.page_url }}
3333
steps:
3434
- uses: actions/checkout@v6
35+
with:
36+
fetch-depth: 0
3537

3638
- name: Setup Python
3739
uses: actions/setup-python@v6
@@ -43,7 +45,9 @@ jobs:
4345
with:
4446
java-version: 21
4547
distribution: temurin
46-
cache: gradle
48+
49+
- name: Setup Gradle
50+
uses: gradle/actions/setup-gradle@v5
4751

4852
- name: Download existing GitHub Pages artifact
4953
continue-on-error: true

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ jobs:
8585
with:
8686
java-version: ${{ env.JAVA_VERSION }}
8787
distribution: temurin
88-
cache: gradle
8988

9089
- name: Setup Gradle
9190
uses: gradle/actions/setup-gradle@v5

.github/workflows/version-tests.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
if: github.repository == 'docling-project/docling-java'
6161
steps:
6262
- uses: actions/checkout@v6
63+
with:
64+
fetch-depth: 0
6365

6466
- name: Reclaim disk space
6567
working-directory: .github/scripts
@@ -90,7 +92,9 @@ jobs:
9092
with:
9193
java-version: ${{ env.JAVA_VERSION }}
9294
distribution: temurin
93-
cache: gradle
95+
96+
- name: Setup Gradle
97+
uses: gradle/actions/setup-gradle@v5
9498

9599
- name: Build version tester
96100
run: ./gradlew --no-daemon -Pjava.version=${{ env.JAVA_VERSION }} :docling-version-tests:build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ build
1010
/docs/src/doc/mkdocs-customizations/macros/__pycache__
1111

1212
.DS_Store
13+
.log

buildSrc/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.kotlin

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
org.gradle.jvmargs=-Xmx8g
2+
13
java.version=17
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists
8+
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f

gradlew.bat

100644100755
Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem https://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
@rem SPDX-License-Identifier: Apache-2.0
17-
@rem
18-
19-
@if "%DEBUG%"=="" @echo off
20-
@rem ##########################################################################
21-
@rem
22-
@rem Gradle startup script for Windows
23-
@rem
24-
@rem ##########################################################################
25-
26-
@rem Set local scope for the variables with windows NT shell
27-
if "%OS%"=="Windows_NT" setlocal
28-
29-
set DIRNAME=%~dp0
30-
if "%DIRNAME%"=="" set DIRNAME=.
31-
@rem This is normally unused
32-
set APP_BASE_NAME=%~n0
33-
set APP_HOME=%DIRNAME%
34-
35-
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
36-
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
37-
38-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
40-
41-
@rem Find java.exe
42-
if defined JAVA_HOME goto findJavaFromJavaHome
43-
44-
set JAVA_EXE=java.exe
45-
%JAVA_EXE% -version >NUL 2>&1
46-
if %ERRORLEVEL% equ 0 goto execute
47-
48-
echo. 1>&2
49-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50-
echo. 1>&2
51-
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52-
echo location of your Java installation. 1>&2
53-
54-
goto fail
55-
56-
:findJavaFromJavaHome
57-
set JAVA_HOME=%JAVA_HOME:"=%
58-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
59-
60-
if exist "%JAVA_EXE%" goto execute
61-
62-
echo. 1>&2
63-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64-
echo. 1>&2
65-
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66-
echo location of your Java installation. 1>&2
67-
68-
goto fail
69-
70-
:execute
71-
@rem Setup the command line
72-
73-
74-
75-
@rem Execute Gradle
76-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
77-
78-
:end
79-
@rem End local scope for the variables with windows NT shell
80-
if %ERRORLEVEL% equ 0 goto mainEnd
81-
82-
:fail
83-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
84-
rem the _cmd.exe /c_ return code!
85-
set EXIT_CODE=%ERRORLEVEL%
86-
if %EXIT_CODE% equ 0 set EXIT_CODE=1
87-
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
88-
exit /b %EXIT_CODE%
89-
90-
:mainEnd
91-
if "%OS%"=="Windows_NT" endlocal
92-
93-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
18+
19+
@if "%DEBUG%"=="" @echo off
20+
@rem ##########################################################################
21+
@rem
22+
@rem Gradle startup script for Windows
23+
@rem
24+
@rem ##########################################################################
25+
26+
@rem Set local scope for the variables with windows NT shell
27+
if "%OS%"=="Windows_NT" setlocal
28+
29+
set DIRNAME=%~dp0
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
32+
set APP_BASE_NAME=%~n0
33+
set APP_HOME=%DIRNAME%
34+
35+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
36+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
37+
38+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
39+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
40+
41+
@rem Find java.exe
42+
if defined JAVA_HOME goto findJavaFromJavaHome
43+
44+
set JAVA_EXE=java.exe
45+
%JAVA_EXE% -version >NUL 2>&1
46+
if %ERRORLEVEL% equ 0 goto execute
47+
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
53+
54+
goto fail
55+
56+
:findJavaFromJavaHome
57+
set JAVA_HOME=%JAVA_HOME:"=%
58+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
59+
60+
if exist "%JAVA_EXE%" goto execute
61+
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
67+
68+
goto fail
69+
70+
:execute
71+
@rem Setup the command line
72+
73+
74+
75+
@rem Execute Gradle
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
77+
78+
:end
79+
@rem End local scope for the variables with windows NT shell
80+
if %ERRORLEVEL% equ 0 goto mainEnd
81+
82+
:fail
83+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
84+
rem the _cmd.exe /c_ return code!
85+
set EXIT_CODE=%ERRORLEVEL%
86+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
87+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
88+
exit /b %EXIT_CODE%
89+
90+
:mainEnd
91+
if "%OS%"=="Windows_NT" endlocal
92+
93+
:omega

0 commit comments

Comments
 (0)