From e3b1d16fd55de486b6aa1ec10bbe26c1520eea4c Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Thu, 13 Jan 2022 16:12:41 -0700
Subject: [PATCH] Use JDK 17

Issue gh-611
---
 buildSrc/build.gradle                                         | 2 +-
 .../io/spring/gradle/convention/SpringModulePlugin.groovy     | 4 +++-
 gradle/java.gradle                                            | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 7f5d01ea..28594604 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'com.apollographql.apollo' version '2.4.5'
 }
 
-sourceCompatibility = JavaVersion.VERSION_11
+sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
     gradlePluginPortal()
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
index 36a7013f..9d8c7b69 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy
@@ -14,8 +14,9 @@
  * the License.
  */
 
-package io.spring.gradle.convention;
+package io.spring.gradle.convention
 
+import org.gradle.api.JavaVersion;
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.gradle.api.plugins.MavenPlugin;
@@ -40,6 +41,7 @@ class SpringModulePlugin extends AbstractSpringJavaPlugin {
 		if (!Utils.isRelease(project)) {
 			deployArtifacts.dependsOn project.tasks.artifactoryPublish
 		}
+		project.java.sourceCompatibility = JavaVersion.VERSION_17
 	}
 
 }
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 4b709b39..acdcaca2 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -1,6 +1,9 @@
 apply plugin: 'java'
 apply plugin: 'org.springframework.optional'
 
+sourceCompatibility = '17'
+targetCompatibility = '17'
+
 ext.apacheDsVersion = '1.5.5'
 ext.springVersion = '6.0.0-SNAPSHOT'
 ext.springDataVersion = '3.0.0-SNAPSHOT'