Skip to content

fix(tests): revert gradle-wrapper bump #21064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
porridge wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(tests): revert gradle-wrapper bump #21064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions qa-tests-backend/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ apply(from = "protobuf.gradle")

// Assign all Java source dirs to Groovy, as the groovy compiler should take care of them.
project.sourceSets.forEach { sourceSet ->
sourceSet.java.srcDirs.forEach { dir -> sourceSet.groovy.srcDir(dir) }
sourceSet.groovy.srcDirs += sourceSet.java.srcDirs
sourceSet.java.setSrcDirs(emptyList<File>())
}

Expand Down Expand Up @@ -88,10 +88,6 @@ dependencies {
implementation(projects.annotations)
}

tasks.withType<GroovyCompile>().configureEach {
groovyOptions.forkOptions.memoryMaximumSize = "4g"
}

// Apply some base attributes to all the test tasks.
tasks.withType<Test>().configureEach {
testLogging {
Expand Down Expand Up @@ -251,8 +247,7 @@ tasks.register<Test>("testDeploymentCheck") {
allprojects {
apply(plugin = "java")
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
2 changes: 1 addition & 1 deletion qa-tests-backend/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ commons-codec = { module = "commons-codec:commons-codec", version = "1.22.0" }
uuid-creator = { module = "com.github.f4b6a3:uuid-creator", version = "6.1.1" }

[plugins]
protobuf = { id = "com.google.protobuf", version = "0.10.0" }
protobuf = { id = "com.google.protobuf", version = "0.8.19" }

[bundles]
Binary file modified qa-tests-backend/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 1 addition & 3 deletions qa-tests-backend/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
15 changes: 8 additions & 7 deletions qa-tests-backend/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 22 additions & 12 deletions qa-tests-backend/gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions qa-tests-backend/protobuf.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ protobuf {
}
}

// Add each output source directory to the sourceSet based on its basename (e.g., `java`).
all().each { task ->
task.outputSourceDirectories.each { srcDir ->
project.sourceSets.getByName(task.sourceSet.name).groovy.srcDirs += srcDir
task.outputSourceDirectorySet.srcDirs.each { srcDir ->
sourceSets[task.sourceSet.name][srcDir.name].srcDirs += srcDir
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions qa-tests-backend/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}

dependencyResolutionManagement {
repositories {
mavenLocal()
Expand Down
Loading