From 5b158389b01d028e98e59f0ea41c01d625a84242 Mon Sep 17 00:00:00 2001 From: Jiayu Liu Date: Thu, 12 May 2022 00:20:37 +0800 Subject: THRIFT-5581: use gradle 7 for java/kotlin (#2601) * upgrade gradle version to 7.4 * migrate from `maven` plugin to `maven-publish` plugin as required for Gradle 7 * add guard to ktfmt, since it can't run with JDK 8 Co-authored-by: Christopher Tubbs --- build/docker/ubuntu-bionic/Dockerfile | 4 ++-- build/docker/ubuntu-disco/Dockerfile | 4 ++-- build/docker/ubuntu-xenial/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'build') diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile index 134d3ef56..4518df7d5 100644 --- a/build/docker/ubuntu-bionic/Dockerfile +++ b/build/docker/ubuntu-bionic/Dockerfile @@ -149,7 +149,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="6.9.2" +ENV GRADLE_VERSION="7.4.2" RUN apt-get install -y --no-install-recommends \ `# Java dependencies` \ ant \ @@ -158,7 +158,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 "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ + (echo "29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda /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-disco/Dockerfile b/build/docker/ubuntu-disco/Dockerfile index ac3d81653..c6598f74e 100644 --- a/build/docker/ubuntu-disco/Dockerfile +++ b/build/docker/ubuntu-disco/Dockerfile @@ -148,7 +148,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="6.9.2" +ENV GRADLE_VERSION="7.4.2" RUN apt-get install -y --no-install-recommends \ `# Java dependencies` \ ant \ @@ -157,7 +157,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 "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ + (echo "29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda /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-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile index 637fa2517..7c523b42f 100644 --- a/build/docker/ubuntu-xenial/Dockerfile +++ b/build/docker/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="6.9.2" +ENV GRADLE_VERSION="7.4.2" 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 "8b356fd8702d5ffa2e066ed0be45a023a779bba4dd1a68fd11bc2a6bdc981e8f /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ + (echo "29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda /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 -- cgit v1.2.1