diff options
| author | Jiayu Liu <Jimexist@users.noreply.github.com> | 2022-10-10 08:45:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 08:45:10 +0800 |
| commit | 1d61fe1c1f39adc5f648f3f242c6de2bcc425cc0 (patch) | |
| tree | 619acaf9d3fc50ea09d3d6fa753bd0d416151ba7 /lib | |
| parent | d21e95a88f38d155dbb5da858b2f0391d72a7e2e (diff) | |
| download | thrift-1d61fe1c1f39adc5f648f3f242c6de2bcc425cc0.tar.gz | |
THRIFT-5633: move xenial to old, deprecate xenial in travis build (#2690)
* move xenial to old, deprecate xenial in travis build
* add back stage of docker
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kotlin/settings.gradle.kts | 9 | ||||
| -rwxr-xr-x | lib/perl/build-cpan-dist.sh | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/lib/kotlin/settings.gradle.kts b/lib/kotlin/settings.gradle.kts index 2eff40294..c252addac 100644 --- a/lib/kotlin/settings.gradle.kts +++ b/lib/kotlin/settings.gradle.kts @@ -19,14 +19,7 @@ pluginManagement { plugins { kotlin("jvm") version "1.6.10" - // per https://github.com/cortinico/ktfmt-gradle/tags the latest version requires Gradle 7.4 which in turn - // requires Java 11, failing the xenial build which is still on Java 8. Here we both configure the plugin - // but with different version, and only enabling ktfmt configure for Java 11+, to make the legacy build happy - if (JavaVersion.current().isJava11Compatible) { - id("com.ncorti.ktfmt.gradle") version "0.8.0" - } else { - id("com.ncorti.ktfmt.gradle") version "0.5.0" - } + id("com.ncorti.ktfmt.gradle") version "0.8.0" } } diff --git a/lib/perl/build-cpan-dist.sh b/lib/perl/build-cpan-dist.sh index ac0ff0bc0..b9250f475 100755 --- a/lib/perl/build-cpan-dist.sh +++ b/lib/perl/build-cpan-dist.sh @@ -2,7 +2,7 @@ # # This script is intended to be used after tagging the repository and updating # the version files for a release. It will create a CPAN archive. Run this -# from inside a docker image like ubuntu-xenial. +# from inside a docker image like ubuntu-focal. # set -e |