Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Java 16 + gradle 7.0 compatibility #520

Merged
merged 4 commits into from
Nov 24, 2021
Merged

Java 16 + gradle 7.0 compatibility #520

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
632a8c5
Java 16 + gradle 7.0 compatibility
popfalushi Apr 16, 2021
ea27bb6
Java 16 + gradle 7.0.1 compatibility
popfalushi May 13, 2021
f6e6278
Merge branch 'master' into pr/520
ST-DDT Nov 22, 2021
b8c6bb2
Retain java 8 support
ST-DDT Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import java.time.OffsetDateTime
import java.time.format.DateTimeFormatter
import io.franzbecker.gradle.lombok.task.DelombokTask

buildscript {
repositories {
Expand Down Expand Up @@ -29,7 +28,7 @@ buildscript {
// https://github.com/spring-projects/spring-security-oauth/releases
springSecurityOAuthVersion = '2.5.1.RELEASE'

lombokPluginVersion = '5.0.0'
lombokPluginVersion = '6.3.0'
versioningPluginVersion = '2.15.1'
versionsPluginVersion = '0.39.0'
}
Expand All @@ -42,7 +41,7 @@ plugins {
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'net.nemerosa.versioning' version "${versioningPluginVersion}"
id 'com.google.protobuf' version "${protobufGradlePluginVersion}"
id 'io.franzbecker.gradle-lombok' version "${lombokPluginVersion}" apply false
id 'io.freefair.lombok' version "${lombokPluginVersion}" apply false
id 'com.github.ben-manes.versions' version "${versionsPluginVersion}" // gradle dependencyUpdates
id 'com.diffplug.spotless' version '6.0.0'
}
Expand Down Expand Up @@ -77,7 +76,7 @@ allprojects {
apply plugin: 'eclipse'
apply plugin: 'io.spring.dependency-management'
apply plugin: 'com.diffplug.spotless'
apply plugin: 'io.franzbecker.gradle-lombok'
apply plugin: 'io.freefair.lombok'

java {
toolchain {
Expand Down Expand Up @@ -218,17 +217,6 @@ allprojects { project ->
}

if (project.name == 'grpc-common-spring-boot' || project.name == 'grpc-client-spring-boot-autoconfigure' || project.name == 'grpc-server-spring-boot-autoconfigure') {
// Properly generate javadocs for the important projects

task delombok(type: DelombokTask, dependsOn: compileJava) {
ext.outputDir = file("$buildDir/delombok")
outputs.dir(outputDir)
sourceSets.main.java.srcDirs.each {
inputs.dir(it)
args(it, '-d', outputDir)
}
}

java {
registerFeature('optionalSupport') {
usingSourceSet(sourceSets.main)
Expand All @@ -241,7 +229,7 @@ allprojects { project ->
if (project.name != 'grpc-common-spring-boot') {
dependsOn(":grpc-common-spring-boot:javadoc")
}
source = delombok.outputDir
source = delombok
failOnError = false
options.locale = 'en_US'
options.encoding = 'UTF-8'
Expand Down