Upgrade to Gradle 8.x

Netflix · Dec 10, 2024 · de664a0 · de664a0
1 parent 1e71df6
commit de664a0
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 35 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 
 plugins {
-  id 'nebula.netflixoss' version '9.1.0'
+  id 'com.netflix.nebula.netflixoss' version '11.5.0'
 }
 
 // Establish version and status
 ext.githubProjectName = 'awsobjectmapper'
 
 allprojects {
   apply plugin: 'nebula.netflixoss'
-  apply plugin: 'java'
+  apply plugin: 'java-library'
   apply plugin: 'idea'
 }
 
@@ -39,41 +39,43 @@ subprojects {
   }
 
   dependencies {
-    compile "com.amazonaws:aws-java-sdk-autoscaling:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-cloudwatch:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-config:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-core:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-dynamodb:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-ec2:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-ecs:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-efs:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-elasticache:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-elasticloadbalancing:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-elasticloadbalancingv2:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-elasticsearch:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-iam:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-lambda:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-rds:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-route53:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-s3:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-ses:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-sns:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-sqs:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-ssm:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-sts:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-support:${awsSdkVersion}"
-    compile "com.amazonaws:aws-java-sdk-xray:${awsSdkVersion}"
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.12.6'
-    testCompile 'junit:junit:4.10'
-    testCompile 'com.google.guava:guava:18.0'
-    testCompile 'org.jeasy:easy-random-core:4.0.0'
+    api "com.amazonaws:aws-java-sdk-autoscaling:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-cloudwatch:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-config:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-core:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-dynamodb:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-ec2:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-ecs:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-efs:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-elasticache:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-elasticloadbalancing:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-elasticloadbalancingv2:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-elasticsearch:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-iam:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-lambda:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-rds:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-route53:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-s3:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-ses:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-sns:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-sqs:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-ssm:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-sts:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-support:${awsSdkVersion}"
+    api "com.amazonaws:aws-java-sdk-xray:${awsSdkVersion}"
+    api 'com.fasterxml.jackson.core:jackson-databind:2.12.6'
+    testImplementation 'junit:junit:4.10'
+    testImplementation 'com.google.guava:guava:18.0'
+    testImplementation 'org.jeasy:easy-random-core:4.0.0'
   }
 }
 
 project(':awsobjectmapper') {
   apply plugin: AwsMixinGenerator
 
   compileJava.dependsOn generateAwsMixins
+  sourcesJar.dependsOn tasks.withType(JavaCompile), generateAwsMixins
+  licenseMain.dependsOn tasks.withType(JavaCompile), generateAwsMixins
 
   sourceSets {
     main {

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -5,7 +5,7 @@ repositories {
 apply plugin: 'groovy'
 
 dependencies {
-  compile gradleApi()
-  compile localGroovy()
-  compile 'com.google.guava:guava:18.0'
+  implementation gradleApi()
+    implementation localGroovy()
+    implementation 'com.google.guava:guava:18.0'
 }
diff --git a/buildSrc/src/main/groovy/AwsMixinGenerator.groovy b/buildSrc/src/main/groovy/AwsMixinGenerator.groovy
@@ -211,7 +211,7 @@ class AwsMixinGenerator implements Plugin<Project> {
 
       List<String> overrides = new ArrayList<String>()
 
-      URL[] compileClasspath = project.configurations.getByName('compile').files.collect { it.toURI().toURL() }
+      URL[] compileClasspath = project.configurations.getByName('compileClasspath').files.collect { it.toURI().toURL() }
       ClassLoader cl = new URLClassLoader(compileClasspath)
 
       new File(outputDir, "AmazonObjectMapperConfigurer.java").withWriter { out ->

diff --git 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.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists