This is an automated email from the ASF dual-hosted git repository.
jiayuliu pushed a commit to branch use-gradle-84
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit b80c29611a1e2cb686baf119e7e811c41d7247e1
Author: Jiayu Liu <ji...@hey.com>
AuthorDate: Sat Oct 14 15:24:12 2023 +0800
use gradle 8.4
---
.github/workflows/build.yml | 4 ++--
build/docker/old/ubuntu-disco/Dockerfile | 4 ++--
build/docker/old/ubuntu-xenial/Dockerfile | 4 ++--
build/docker/ubuntu-bionic/Dockerfile | 4 ++--
build/docker/ubuntu-focal/Dockerfile | 4 ++--
build/docker/ubuntu-jammy/Dockerfile | 4 ++--
doc/install/README.md | 2 +-
doc/install/debian.md | 2 +-
lib/java/README.md | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 958a308da..c5d66f6ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -141,7 +141,7 @@ jobs:
needs: compiler
runs-on: ubuntu-20.04
env:
- GRADLE_VERSION: "8.0.2"
+ GRADLE_VERSION: "8.4"
steps:
- uses: actions/checkout@v4
@@ -160,7 +160,7 @@ jobs:
- name: Setup gradle
run: |
wget
https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O
/tmp/gradle-$GRADLE_VERSION-bin.zip
- (echo
"ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -)
+ (echo
"3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -)
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip
sudo mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle
sudo ln -s /usr/local/gradle/bin/gradle /usr/local/bin
diff --git a/build/docker/old/ubuntu-disco/Dockerfile
b/build/docker/old/ubuntu-disco/Dockerfile
index 55dc85369..43f4a0095 100644
--- a/build/docker/old/ubuntu-disco/Dockerfile
+++ b/build/docker/old/ubuntu-disco/Dockerfile
@@ -160,7 +160,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null
-ENV GRADLE_VERSION="8.0.2"
+ENV GRADLE_VERSION="8.4"
RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
@@ -169,7 +169,7 @@ RUN apt-get install -y --no-install-recommends \
openjdk-11-jdk-headless && \
`# Gradle` \
wget
https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O
/tmp/gradle-$GRADLE_VERSION-bin.zip && \
- (echo "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
+ (echo "3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
diff --git a/build/docker/old/ubuntu-xenial/Dockerfile
b/build/docker/old/ubuntu-xenial/Dockerfile
index d954e7fd9..735108552 100644
--- a/build/docker/old/ubuntu-xenial/Dockerfile
+++ b/build/docker/old/ubuntu-xenial/Dockerfile
@@ -155,7 +155,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib install --always hxcpp 3.4.64 2>&1 > /dev/null
# note: hxcpp 3.4.185 (latest) no longer ships static libraries, and caused a
build failure
-ENV GRADLE_VERSION="8.0.2"
+ENV GRADLE_VERSION="8.4"
RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
@@ -165,7 +165,7 @@ RUN apt-get install -y --no-install-recommends \
unzip && \
`# Gradle` \
wget
https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O
/tmp/gradle-$GRADLE_VERSION-bin.zip && \
- (echo "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
+ (echo "3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
diff --git a/build/docker/ubuntu-bionic/Dockerfile
b/build/docker/ubuntu-bionic/Dockerfile
index d6d2bda59..57a8aee25 100644
--- a/build/docker/ubuntu-bionic/Dockerfile
+++ b/build/docker/ubuntu-bionic/Dockerfile
@@ -161,7 +161,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null
-ENV GRADLE_VERSION="8.0.2"
+ENV GRADLE_VERSION="8.4"
RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
@@ -170,7 +170,7 @@ RUN apt-get install -y --no-install-recommends \
openjdk-17-jdk-headless && \
`# Gradle` \
wget
https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O
/tmp/gradle-$GRADLE_VERSION-bin.zip && \
- (echo "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
+ (echo "3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
diff --git a/build/docker/ubuntu-focal/Dockerfile
b/build/docker/ubuntu-focal/Dockerfile
index 1f305734f..a6121fadd 100644
--- a/build/docker/ubuntu-focal/Dockerfile
+++ b/build/docker/ubuntu-focal/Dockerfile
@@ -162,7 +162,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null
-ENV GRADLE_VERSION="8.0.2"
+ENV GRADLE_VERSION="8.4"
RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
@@ -171,7 +171,7 @@ RUN apt-get install -y --no-install-recommends \
openjdk-17-jdk-headless && \
`# Gradle` \
wget
https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O
/tmp/gradle-$GRADLE_VERSION-bin.zip && \
- (echo "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
+ (echo "3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
diff --git a/build/docker/ubuntu-jammy/Dockerfile
b/build/docker/ubuntu-jammy/Dockerfile
index c7724e794..bbb46d79a 100644
--- a/build/docker/ubuntu-jammy/Dockerfile
+++ b/build/docker/ubuntu-jammy/Dockerfile
@@ -162,7 +162,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null
-ENV GRADLE_VERSION="8.0.2"
+ENV GRADLE_VERSION="8.4"
RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
@@ -171,7 +171,7 @@ RUN apt-get install -y --no-install-recommends \
openjdk-11-jdk-headless && \
`# Gradle` \
wget
https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O
/tmp/gradle-$GRADLE_VERSION-bin.zip && \
- (echo "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
+ (echo "3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin
diff --git a/doc/install/README.md b/doc/install/README.md
index b90e5c6a3..d073e918d 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -29,7 +29,7 @@ These are only required if you choose to build the libraries
for the given langu
* Qt (optional)
* Java
* Java 17 (latest LTS)
- * Gradle 8.0.2
+ * Gradle 8.4
* C#: Mono 1.2.4 (and pkg-config to detect it) or Visual Studio 2005+
* Python 2.6 (including header files for extension modules)
* PHP 5.0 (optionally including header files for extension modules)
diff --git a/doc/install/debian.md b/doc/install/debian.md
index 4718017a7..3d80531c8 100644
--- a/doc/install/debian.md
+++ b/doc/install/debian.md
@@ -18,7 +18,7 @@ Debian 7/Ubuntu 12 users need to manually install a more
recent version of autom
If you would like to build Apache Thrift libraries for other programming
languages you may need to install additional packages. The following languages
require the specified additional packages:
* Java
- * packages: gradle (version 8.0.2)
+ * packages: gradle (version 8.4)
* You will also need Java JDK v1.8 or higher. Type **javac** to see a
list of available packages, pick the one you prefer and **apt-get install** it
(e.g. default-jdk).
* Ruby
* ruby-full ruby-dev ruby-rspec rake rubygems bundler
diff --git a/lib/java/README.md b/lib/java/README.md
index aa07495c8..c65f97ca4 100644
--- a/lib/java/README.md
+++ b/lib/java/README.md
@@ -50,13 +50,13 @@ the [gradle
documentation](https://docs.gradle.org/current/userguide/installatio
following this step (which is also done in the travis CI docker images):
```bash
-export GRADLE_VERSION="8.0.2"
+export GRADLE_VERSION="8.4"
# install dependencies
apt-get install -y --no-install-recommends openjdk-17-jdk-headless wget unzip
# download gradle distribution
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip
-q -O /tmp/gradle-$GRADLE_VERSION-bin.zip
# check binary integrity
-echo "ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -
+echo "3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
/tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -
# unzip and install
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle
