JDK 16 support. Upgrades gradle and many dependencies.

Author: LunNova

build.gradle.kts

@@ -5,11 +5,11 @@ plugins {
 	id("java")
 	id("java-library")
 	id("maven-publish")
-	id("com.github.johnrengelman.shadow") version "5.2.0" apply false
+	id("com.github.johnrengelman.shadow") version "7.0.0" apply false
 	id("org.shipkit.shipkit-auto-version") version "1.1.1"
 	id("org.shipkit.shipkit-changelog") version "1.1.4"
 	id("org.shipkit.shipkit-github-release") version "1.1.4"
-	id("dev.minco.gradle.defaults-plugin") version "0.2.8"
+	id("dev.minco.gradle.defaults-plugin") version "0.2.26"
 }
 
 apply(from = "properties.gradle")
@@ -69,10 +69,11 @@ allprojects {
 dependencies {
 	testImplementation("junit:junit:4.13.2")
 	implementation("me.nallar.whocalled:WhoCalled:1.1")
-	api("dev.minco:java-transformer:1.10.1")
+	api("dev.minco:java-transformer:1.10.6")
 
-	val lombok = "org.projectlombok:lombok:1.18.18"
-	implementation(lombok)
+	val lombok = "org.projectlombok:lombok:1.18.20"
+	compileOnly(lombok)
+	testCompileOnly(lombok)
 	annotationProcessor(lombok)
 	testAnnotationProcessor(lombok)
 }

gradle-plugin/build.gradle.kts

@@ -10,8 +10,9 @@ plugins {
 apply(from = "groovy.gradle")
 
 dependencies {
-	val lombok = "org.projectlombok:lombok:1.18.18"
-	implementation(lombok)
+	val lombok = "org.projectlombok:lombok:1.18.20"
+	compileOnly(lombok)
+	testCompileOnly(lombok)
 	annotationProcessor(lombok)
 	testAnnotationProcessor(lombok)
 }

gradle-plugin/groovy.gradle

@@ -4,8 +4,8 @@ import org.gradle.api.publish.maven.internal.publication.DefaultMavenPublication
 
 group = 'dev.minco.mixin'
 
-configurations.compile.dependencies.remove dependencies.gradleApi()
-configurations.all { it.dependencies.remove project.dependencies.gradleApi() }
+//configurations.compile.dependencies.remove dependencies.gradleApi()
+//configurations.all { it.dependencies.remove project.dependencies.gradleApi() }
 dependencies { compileOnly gradleApi() }
 
 //task relocateShadowJar(type: ConfigureShadowRelocation) {
@@ -22,7 +22,10 @@ shadowJar {
 dependencies {
 	//compileOnly 'com.google.guava:guava:25.1-jre' // bundled with gradle
 	implementation parent
-	testImplementation('org.spockframework:spock-core:1.3-groovy-2.4') {
+	testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+		exclude module: 'groovy-all'
+	}
+	testImplementation('org.spockframework:spock-junit4:2.0-groovy-3.0') {
 		exclude module: 'groovy-all'
 	}
 	testImplementation('io.github.classgraph:classgraph:4.8.59')

gradle.properties

@@ -0,0 +1,6 @@
+# The exports are needed due to https://github.com/diffplug/spotless/issues/834
+org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Thu Jan 23 11:34:41 GMT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists