Skip to content

Commit

Permalink
[BEAM-13430] Upgrade beam to gradle 7.3.2 (apache#16319)
Browse files Browse the repository at this point in the history
* [BEAM-13430] Upgrade beam to gradle 7.3.2

* [BEAM-13430] Clean up tests that override the time of the JVM

* [BEAM-13430] Remove shadow override
  • Loading branch information
dpcollins-google authored Dec 23, 2021
1 parent 3cedfba commit 4774ac7
Show file tree
Hide file tree
Showing 12 changed files with 172 additions and 131 deletions.
15 changes: 6 additions & 9 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,28 @@ repositories {
url = uri("https://repo.spring.io/plugins-release/")
content { includeGroup("io.spring.gradle") }
}
flatDir { dirs("jarlibs") }
}

// Dependencies on other plugins used when this plugin is invoked
dependencies {
implementation(gradleApi())
implementation(localGroovy())
implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0-log4jfix-SNAPSHOT")
implementation("gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.0")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.1")
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.3")

runtimeOnly("net.ltgt.gradle:gradle-apt-plugin:0.21") // Enable a Java annotation processor
runtimeOnly("com.google.protobuf:protobuf-gradle-plugin:0.8.13") // Enable proto code generation
runtimeOnly("com.commercehub.gradle.plugin:gradle-avro-plugin:0.11.0") // Enable Avro code generation
runtimeOnly("com.diffplug.spotless:spotless-plugin-gradle:5.6.1") // Enable a code formatting plugin
runtimeOnly("gradle.plugin.com.github.blindpirate:gogradle:0.11.4") // Enable Go code compilation
runtimeOnly("gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.0") // Enable building Docker containers
runtimeOnly("gradle.plugin.com.dorongold.plugins:task-tree:1.5") // Adds a 'taskTree' task to print task dependency tree
runtimeOnly("com.github.jengelman.gradle.plugins:shadow:6.1.0-log4jfix-SNAPSHOT") // Enable shading Java dependencies
runtimeOnly("gradle.plugin.com.github.johnrengelman:shadow:7.1.1") // Enable shading Java dependencies
runtimeOnly("ca.coglinc:javacc-gradle-plugin:2.4.0") // Enable the JavaCC parser generator
runtimeOnly("net.linguica.gradle:maven-settings-plugin:0.5")
runtimeOnly("gradle.plugin.io.pry.gradle.offline_dependencies:gradle-offline-dependencies-plugin:0.5.0") // Enable creating an offline repository
runtimeOnly("net.ltgt.gradle:gradle-errorprone-plugin:1.2.1") // Enable errorprone Java static analysis
runtimeOnly("org.ajoberstar.grgit:grgit-gradle:4.0.2") // Enable website git publish to asf-site branch
runtimeOnly("com.avast.gradle:gradle-docker-compose-plugin:0.13.2") // Enable docker compose tasks
runtimeOnly("ca.cutterslade.gradle:gradle-dependency-analyze:1.4.3") // Enable dep analysis
runtimeOnly("org.ajoberstar.grgit:grgit-gradle:4.1.1") // Enable website git publish to asf-site branch
runtimeOnly("com.avast.gradle:gradle-docker-compose-plugin:0.14.12") // Enable docker compose tasks
runtimeOnly("ca.cutterslade.gradle:gradle-dependency-analyze:1.8.3") // Enable dep analysis
runtimeOnly("gradle.plugin.net.ossindex:ossindex-gradle-plugin:0.4.11") // Enable dep vulnerability analysis
runtimeOnly("org.checkerframework:checkerframework-gradle-plugin:0.5.16") // Enable enhanced static checking plugin
}
Expand Down
Binary file removed buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -965,12 +965,6 @@ class BeamModulePlugin implements Plugin<Project> {
project.artifacts.archives project.packageTests
}

// Configures annotation processing for commonly used annotation processors
// across all Java projects.
project.apply plugin: "net.ltgt.apt"
// let idea apt plugin handle the ide integration
project.apply plugin: "net.ltgt.apt-idea"

// Note that these plugins specifically use the compileOnly and testCompileOnly
// configurations because they are never required to be shaded or become a
// dependency of the output.
Expand Down Expand Up @@ -1050,12 +1044,11 @@ class BeamModulePlugin implements Plugin<Project> {
}
project.check.dependsOn project.javadoc

// Apply the eclipse and apt-eclipse plugins. This adds the "eclipse" task and
// Apply the eclipse plugins. This adds the "eclipse" task and
// connects the apt-eclipse plugin to update the eclipse project files
// with the instructions needed to run apt within eclipse to handle the AutoValue
// and additional annotations
project.apply plugin: 'eclipse'
project.apply plugin: "net.ltgt.apt-eclipse"

// Enables a plugin which can apply code formatting to source.
project.apply plugin: "com.diffplug.spotless"
Expand Down Expand Up @@ -1244,7 +1237,7 @@ class BeamModulePlugin implements Plugin<Project> {

project.dependencies {
shadowTestRuntimeClasspath it.project(path: project.path, configuration: "shadowTest")
shadowTestRuntimeClasspath it.project(path: project.path, configuration: "compileOnly")
shadowTestRuntimeClasspath it.project(path: project.path)
}

project.test { classpath = project.configurations.shadowTestRuntimeClasspath }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 4774ac7

Please sign in to comment.