mirror of
https://github.com/vacp2p/linea-monorepo.git
synced 2026-01-08 19:58:01 -05:00
gradle update to 8.10.2 (#253)
* gradle update 8.10.2 ; Remove java-gnark from coordinator
This commit is contained in:
@@ -73,7 +73,7 @@ jobs:
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
- name: Build dist
|
||||
run: |
|
||||
./gradlew coordinator:app:distZip --no-daemon
|
||||
|
||||
2
.github/workflows/coordinator-testing.yml
vendored
2
.github/workflows/coordinator-testing.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
- name: Restore cached images
|
||||
id: restore-cached-images
|
||||
uses: actions/cache/restore@v4.0.2
|
||||
|
||||
@@ -31,7 +31,7 @@ jobs:
|
||||
# Configure Gradle for optimal use in GiHub Actions, including caching of downloaded dependencies.
|
||||
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
|
||||
- name: Clean
|
||||
# ./gradlew clean is necessary because the build is cached
|
||||
|
||||
2
.github/workflows/load-test.yml
vendored
2
.github/workflows/load-test.yml
vendored
@@ -39,7 +39,7 @@ jobs:
|
||||
java-version: 17
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
|
||||
- name: Hide sensitive inputs
|
||||
uses: levibostian/action-hide-sensitive-inputs@1.0.0
|
||||
|
||||
2
.github/workflows/maven-release.yml
vendored
2
.github/workflows/maven-release.yml
vendored
@@ -34,7 +34,7 @@ jobs:
|
||||
# Configure Gradle for optimal use in GiHub Actions, including caching of downloaded dependencies.
|
||||
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
|
||||
- name: Clean
|
||||
# ./gradlew clean is necessary because the build is cached
|
||||
|
||||
@@ -73,7 +73,7 @@ jobs:
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
- name: Build dist
|
||||
run: |
|
||||
./gradlew traces-api-facade:app:shadowJar
|
||||
|
||||
@@ -27,7 +27,7 @@ jobs:
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
- name: Run tests with coverage
|
||||
uses: nick-fields/retry@v2
|
||||
if: ${{ inputs.coverage }}
|
||||
|
||||
@@ -73,7 +73,7 @@ jobs:
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
- name: Build dist
|
||||
run: |
|
||||
./gradlew transaction-exclusion-api:app:distZip --no-daemon
|
||||
|
||||
@@ -9,7 +9,7 @@ on:
|
||||
required: false
|
||||
type: boolean
|
||||
default: false
|
||||
|
||||
|
||||
concurrency:
|
||||
group: transaction-exclusion-api-testing-${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
||||
@@ -26,7 +26,7 @@ jobs:
|
||||
distribution: temurin
|
||||
java-version: 21
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
uses: gradle/actions/setup-gradle@v4
|
||||
- name: Run tests with coverage
|
||||
if: ${{ inputs.coverage }}
|
||||
run: |
|
||||
|
||||
@@ -10,6 +10,7 @@ configurations.configureEach {
|
||||
|
||||
configurations {
|
||||
runtimeClasspath.exclude group: "it.unimi.dsi", module: "fastutil"
|
||||
runtimeClasspath.exclude group: "org.hyperledger.besu", module: "gnark"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
2
gradlew
vendored
2
gradlew
vendored
@@ -55,7 +55,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
|
||||
20
gradlew.bat
vendored
20
gradlew.bat
vendored
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
|
||||
@@ -302,9 +302,7 @@ class VertxHttpJsonRpcClientTest {
|
||||
assertThat(client.makeRequest(request).toSafeFuture())
|
||||
.failsWithin(Duration.ofSeconds(14))
|
||||
.withThrowableOfType(ExecutionException::class.java)
|
||||
.withMessageContaining(
|
||||
"java.net.UnknownHostException: Failed to resolve 'service-not-available'"
|
||||
)
|
||||
.withMessageContaining("service-not-available")
|
||||
|
||||
verify(log).log(
|
||||
eq(Level.DEBUG),
|
||||
|
||||
@@ -3,6 +3,11 @@ plugins {
|
||||
id 'linea.web3j-codegen'
|
||||
alias(libs.plugins.jreleaser)
|
||||
}
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion = JavaLanguageVersion.of(21)
|
||||
}
|
||||
}
|
||||
description = 'Web3J Java client for Linea L1 Rollup Smart Contract'
|
||||
ext.artifactId = 'l1-rollup-contract-client'
|
||||
apply from: rootProject.file("gradle/publishing.gradle")
|
||||
|
||||
@@ -3,6 +3,11 @@ plugins {
|
||||
id 'linea.web3j-codegen'
|
||||
alias(libs.plugins.jreleaser)
|
||||
}
|
||||
java {
|
||||
toolchain {
|
||||
languageVersion = JavaLanguageVersion.of(21)
|
||||
}
|
||||
}
|
||||
|
||||
description = 'Web3J Java client for Linea L2 Message Service Contract'
|
||||
ext.artifactId = 'l2-message-service-contract-client'
|
||||
|
||||
Reference in New Issue
Block a user