Upgrade to Gradle 7.5.1

Netflix · Nov 8, 2022 · 933e588 · 933e588
1 parent c9f0de6
commit 933e588
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,19 +3,17 @@ buildscript {
 }
 
 plugins {
-  id 'nebula.netflixoss' version '9.1.0'
+  id 'com.netflix.nebula.netflixoss' version '11.1.1'
 }
 
 subprojects {
   apply plugin: 'nebula.netflixoss'
   apply plugin: 'checkstyle'
 
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
-
-  tasks.withType(JavaCompile) {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+  java {
+    toolchain {
+      languageVersion = JavaLanguageVersion.of(8)
+    }
   }
 
   tasks.withType(Javadoc) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
diff --git a/hollow-diff-ui/build.gradle b/hollow-diff-ui/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java-library'
-apply plugin: 'nebula.facet'
+apply plugin: 'com.netflix.nebula.facet'
 
 facets {
     tools {

diff --git a/hollow-explorer-ui/build.gradle b/hollow-explorer-ui/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java-library'
-apply plugin: 'nebula.facet'
+apply plugin: 'com.netflix.nebula.facet'
 
 facets {
     tools {

diff --git a/hollow-perf/build.gradle b/hollow-perf/build.gradle
@@ -12,10 +12,8 @@ dependencies {
   compileOnly 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
 }
 
-compileJava {
+tasks.withType(JavaCompile).configureEach {
   options.compilerArgs << '-XDignore.symbol.file'
-  options.fork = true
-  options.forkOptions.executable = 'javac'
 }
 
 jmh {

diff --git a/hollow-ui-tools/build.gradle b/hollow-ui-tools/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java-library'
-apply plugin: 'nebula.facet'
+apply plugin: 'com.netflix.nebula.facet'
 
 facets {
     tools {

diff --git a/hollow/build.gradle b/hollow/build.gradle
@@ -8,13 +8,11 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.15.0'
 }
 
-// quiet warnings about sun.misc.Unsafe
-compileJava {
-  options.compilerArgs << '-XDignore.symbol.file'
-  options.fork = true
-  options.forkOptions.executable = 'javac'
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs << '-XDignore.symbol.file'
 }
 
+
 javadoc {
     options.addStringOption('XDignore.symbol.file', '-quiet')
 }