From b939ebaa875a765c8be88620adbfcd54869815dd Mon Sep 17 00:00:00 2001 From: proferabg Date: Fri, 7 Feb 2025 15:01:45 -0500 Subject: [PATCH 1/2] Java 17 + Gradle 7.4 --- build.gradle | 5 ++++- config/build.gradle | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 911051d..ea61896 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,10 @@ apply plugin: 'java-library' apply plugin: 'maven-publish' apply plugin: 'ru.vyarus.quality' -sourceCompatibility = 1.8 +compileJava { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} repositories { mavenCentral() diff --git a/config/build.gradle b/config/build.gradle index f8e188c..9b379ac 100644 --- a/config/build.gradle +++ b/config/build.gradle @@ -21,7 +21,10 @@ version '1.0-SNAPSHOT' apply plugin: 'java-library' apply plugin: 'ru.vyarus.quality' -sourceCompatibility = 1.8 +compileJava { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} repositories { mavenCentral() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4f0001..41dfb87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3d56d654b04617748d555410b30f06ac20f33ffd Mon Sep 17 00:00:00 2001 From: proferabg Date: Sun, 9 Feb 2025 13:58:33 -0500 Subject: [PATCH 2/2] Switch back to JDK 8 Compatibility --- build.gradle | 8 +++----- config/build.gradle | 7 ++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index ea61896..bcf62c1 100644 --- a/build.gradle +++ b/build.gradle @@ -15,11 +15,6 @@ apply plugin: 'java-library' apply plugin: 'maven-publish' apply plugin: 'ru.vyarus.quality' -compileJava { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} - repositories { mavenCentral() maven { @@ -49,6 +44,9 @@ dependencies { java { withJavadocJar() withSourcesJar() + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } } task sourceJar(type: Jar) { diff --git a/config/build.gradle b/config/build.gradle index 9b379ac..623d3c4 100644 --- a/config/build.gradle +++ b/config/build.gradle @@ -21,9 +21,10 @@ version '1.0-SNAPSHOT' apply plugin: 'java-library' apply plugin: 'ru.vyarus.quality' -compileJava { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } } repositories {