Skip to content

Commit

Permalink
chore: Upgrade to Gradle 8.4 (#442)
Browse files Browse the repository at this point in the history
Upgraded to the latest Gradle stable version.

See https://docs.gradle.org/current/userguide/upgrading_version_7.html
  • Loading branch information
ctasada authored Nov 10, 2023
1 parent a82bf79 commit 34c1a26
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
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,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 17 additions & 2 deletions springwolf-examples/springwolf-kafka-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ docker {

test {
dependsOn dockerBuildImage
// generate the open api docs before tests are executed so that if it works, the json is already there
dependsOn generateOpenApiDocs
}

openApi {
Expand All @@ -88,5 +90,18 @@ openApi {
outputFileName = "openapi-generated.json"
}

// generate the open api docs before tests are executed so that if it works, the json is already there
test.dependsOn("generateOpenApiDocs")
afterEvaluate {
tasks {
forkedSpringBootRun {
dependsOn bootJar
dependsOn compileTestJava
dependsOn dockerCreateDockerfile
dependsOn dockerBuildImage
dependsOn dockerSyncBuildContext
dependsOn jar
dependsOn processTestResources
dependsOn spotlessJava
doNotTrackState("See https://github.com/springdoc/springdoc-openapi-gradle-plugin/issues/102")
}
}
}
5 changes: 4 additions & 1 deletion springwolf-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ npm_run_build {
outputs.dir 'build'
}

task buildPages(type: NpmTask) {
tasks.register('buildPages', NpmTask) {
args = ['run', 'build_pages']

inputs.files fileTree("src")
Expand Down Expand Up @@ -89,6 +89,9 @@ spotless {
endWithNewline()
}
}

sourcesJar.dependsOn(npm_run_build)

tasks.named('spotlessStyling').configure {
it.dependsOn('nodeSetup', 'npmSetup')
}
Expand Down

0 comments on commit 34c1a26

Please sign in to comment.