Skip to content

Commit 8d17ac2

Browse files
committed
- switches infrastructure to java 18
1 parent 4769907 commit 8d17ac2

File tree

10 files changed

+23
-15
lines changed

10 files changed

+23
-15
lines changed

.github/workflows/api-level-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/setup-java@v3
2020
with:
2121
distribution: 'adopt'
22-
java-version: 17
22+
java-version: 18
2323
- name: Setup Android SDK
2424
uses: android-actions/[email protected]
2525
- name: Add execution right to the script

.github/workflows/build-and-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up JDK
2727
uses: actions/setup-java@v3
2828
with:
29-
java-version: 17
29+
java-version: 18
3030
distribution: 'adopt'
3131
cache: gradle
3232
- name: Download file
@@ -58,7 +58,7 @@ jobs:
5858
- name: Set up JDK
5959
uses: actions/setup-java@v3
6060
with:
61-
java-version: 17
61+
java-version: 18
6262
distribution: 'adopt'
6363
cache: gradle
6464
- name: Download file

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/setup-java@v3
2727
with:
2828
distribution: 'adopt'
29-
java-version: 17
29+
java-version: 18
3030

3131
# If this run was triggered by a pull request event, then checkout
3232
# the head of the pull request instead of the merge commit.

.github/workflows/gradle-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up JDK
2020
uses: actions/setup-java@v3
2121
with:
22-
java-version: 17
22+
java-version: 18
2323
distribution: 'adopt'
2424
cache: gradle
2525
- name: Easy detect-secrets

.github/workflows/sample-build-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/setup-java@v3
1616
with:
1717
distribution: 'adopt'
18-
java-version: 17
18+
java-version: 18
1919
- name: Add execution right to the script
2020
run: chmod +x gradlew
2121
working-directory: ./samples/deviceCodeSample
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/setup-java@v3
3030
with:
3131
distribution: 'adopt'
32-
java-version: 17
32+
java-version: 18
3333
- name: Add execution right to the script
3434
run: chmod +x gradlew
3535
working-directory: ./samples/interactiveBrowserSample

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up JDK
2020
uses: actions/setup-java@v3
2121
with:
22-
java-version: 17
22+
java-version: 18
2323
distribution: 'adopt'
2424
cache: gradle
2525
- name: Cache SonarCloud packages

gradle/wrapper/gradle-wrapper.jar

935 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ set -- \
205205
org.gradle.wrapper.GradleWrapperMain \
206206
"$@"
207207

208+
# Stop when "xargs" is not available.
209+
if ! command -v xargs >/dev/null 2>&1
210+
then
211+
die "xargs is not available"
212+
fi
213+
208214
# Use "xargs" to parse quoted args.
209215
#
210216
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,7 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
2929
set APP_BASE_NAME=%~n0
3030
set APP_HOME=%DIRNAME%
3131

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
43+
if %ERRORLEVEL% equ 0 goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7575

7676
:end
7777
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
78+
if %ERRORLEVEL% equ 0 goto mainEnd
7979

8080
:fail
8181
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8282
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
83+
set EXIT_CODE=%ERRORLEVEL%
84+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
85+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
86+
exit /b %EXIT_CODE%
8587

8688
:mainEnd
8789
if "%OS%"=="Windows_NT" endlocal

0 commit comments

Comments
 (0)