valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-06 18:35:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update gradle to version 7.6 (#2744)

Browse Source 
* update gradle to version 7.6

* update hash
This commit is contained in:
Jiayu Liu 2023-04-09 14:39:20 +07:00 committed by GitHub
parent c82d0c2101
commit 79a4b1e9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -137,7 +137,7 @@ jobs:
needs: compiler needs: compiler
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
GRADLE_VERSION: 7.5.1 GRADLE_VERSION: "7.6"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -156,7 +156,7 @@ jobs:
- name: Setup gradle - name: Setup gradle
run: | run: |
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip
(echo "f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) (echo "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -)
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip
sudo mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle sudo mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle
sudo ln -s /usr/local/gradle/bin/gradle /usr/local/bin sudo ln -s /usr/local/gradle/bin/gradle /usr/local/bin

4
build/docker/old/ubuntu-disco/Dockerfile
View File

@ -160,7 +160,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib setup --always /usr/share/haxe/lib && \ haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null haxelib install --always hxcpp 2>&1 > /dev/null
ENV GRADLE_VERSION="7.5.1" ENV GRADLE_VERSION="7.6"
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \ `# Java dependencies` \
ant \ ant \
@ -169,7 +169,7 @@ RUN apt-get install -y --no-install-recommends \
openjdk-11-jdk-headless && \ openjdk-11-jdk-headless && \
`# Gradle` \ `# Gradle` \
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
(echo "f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ (echo "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \ unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \ mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin ln -s /usr/local/gradle/bin/gradle /usr/local/bin

4
build/docker/old/ubuntu-xenial/Dockerfile
View File

@ -155,7 +155,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib install --always hxcpp 3.4.64 2>&1 > /dev/null 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 # note: hxcpp 3.4.185 (latest) no longer ships static libraries, and caused a build failure
ENV GRADLE_VERSION="7.5.1" ENV GRADLE_VERSION="7.6"
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \ `# Java dependencies` \
ant \ ant \
@ -165,7 +165,7 @@ RUN apt-get install -y --no-install-recommends \
unzip && \ unzip && \
`# Gradle` \ `# Gradle` \
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
(echo "f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ (echo "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \ unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \ mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin ln -s /usr/local/gradle/bin/gradle /usr/local/bin

4
build/docker/ubuntu-bionic/Dockerfile
View File

@ -161,7 +161,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib setup --always /usr/share/haxe/lib && \ haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null haxelib install --always hxcpp 2>&1 > /dev/null
ENV GRADLE_VERSION="7.5.1" ENV GRADLE_VERSION="7.6"
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \ `# Java dependencies` \
ant \ ant \
@ -170,7 +170,7 @@ RUN apt-get install -y --no-install-recommends \
openjdk-17-jdk-headless && \ openjdk-17-jdk-headless && \
`# Gradle` \ `# Gradle` \
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
(echo "f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ (echo "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \ unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \ mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin ln -s /usr/local/gradle/bin/gradle /usr/local/bin

4
build/docker/ubuntu-focal/Dockerfile
View File

@ -162,7 +162,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib setup --always /usr/share/haxe/lib && \ haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null haxelib install --always hxcpp 2>&1 > /dev/null
ENV GRADLE_VERSION="7.5.1" ENV GRADLE_VERSION="7.6"
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \ `# Java dependencies` \
ant \ ant \
@ -171,7 +171,7 @@ RUN apt-get install -y --no-install-recommends \
openjdk-17-jdk-headless && \ openjdk-17-jdk-headless && \
`# Gradle` \ `# Gradle` \
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
(echo "f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ (echo "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \ unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \ mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin ln -s /usr/local/gradle/bin/gradle /usr/local/bin

4
build/docker/ubuntu-jammy/Dockerfile
View File

@ -162,7 +162,7 @@ RUN apt-get install -y --no-install-recommends \
haxelib setup --always /usr/share/haxe/lib && \ haxelib setup --always /usr/share/haxe/lib && \
haxelib install --always hxcpp 2>&1 > /dev/null haxelib install --always hxcpp 2>&1 > /dev/null
ENV GRADLE_VERSION="7.5.1" ENV GRADLE_VERSION="7.6"
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \ `# Java dependencies` \
ant \ ant \
@ -171,7 +171,7 @@ RUN apt-get install -y --no-install-recommends \
openjdk-11-jdk-headless && \ openjdk-11-jdk-headless && \
`# Gradle` \ `# Gradle` \
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \
(echo "f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ (echo "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \ unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip && \
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \ mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle && \
ln -s /usr/local/gradle/bin/gradle /usr/local/bin ln -s /usr/local/gradle/bin/gradle /usr/local/bin

2
doc/install/README.md
View File

@ -29,7 +29,7 @@ These are only required if you choose to build the libraries for the given langu
* Qt (optional) * Qt (optional)
* Java * Java
* Java 17 * Java 17
* Gradle 7.5.1 * Gradle 7.6
* C#: Mono 1.2.4 (and pkg-config to detect it) or Visual Studio 2005+ * C#: Mono 1.2.4 (and pkg-config to detect it) or Visual Studio 2005+
* Python 2.6 (including header files for extension modules) * Python 2.6 (including header files for extension modules)
* PHP 5.0 (optionally including header files for extension modules) * PHP 5.0 (optionally including header files for extension modules)

2
doc/install/debian.md
View File

@ -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: 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 * Java
* packages: gradle (version 7.5.1) * packages: gradle (version 7.6)
* 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). * 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
* ruby-full ruby-dev ruby-rspec rake rubygems bundler * ruby-full ruby-dev ruby-rspec rake rubygems bundler

6
lib/java/README.md
View File

@ -42,7 +42,7 @@ The Thrift Java source is not build using the GNU tools, but rather uses
the Gradle build system, which tends to be predominant amongst Java the Gradle build system, which tends to be predominant amongst Java
developers. developers.
Currently we use gradle 7.5.1 to build the Thrift Java source. The usual way to setup gradle Currently we use gradle 7.6 to build the Thrift Java source. The usual way to setup gradle
project is to include the gradle-wrapper.jar in the project and then run the gradle wrapper to project is to include the gradle-wrapper.jar in the project and then run the gradle wrapper to
bootstrap setting up gradle binaries. However to avoid putting binary files into the source tree we bootstrap setting up gradle binaries. However to avoid putting binary files into the source tree we
have ignored the gradle wrapper files. You are expected to install it manually, as described in have ignored the gradle wrapper files. You are expected to install it manually, as described in
@ -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): following this step (which is also done in the travis CI docker images):
```bash ```bash
export GRADLE_VERSION="7.5.1" export GRADLE_VERSION="7.6"
# install dependencies # install dependencies
apt-get install -y --no-install-recommends openjdk-17-jdk-headless wget unzip apt-get install -y --no-install-recommends openjdk-17-jdk-headless wget unzip
# download gradle distribution # download gradle distribution
wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip
# check binary integrity # check binary integrity
echo "f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c - echo "7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -
# unzip and install # unzip and install
unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip unzip -d /tmp /tmp/gradle-$GRADLE_VERSION-bin.zip
mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle mv /tmp/gradle-$GRADLE_VERSION /usr/local/gradle