diff --git a/backend/app/build.gradle b/backend/app/build.gradle index a9d3e0b5c9..653253d78d 100644 --- a/backend/app/build.gradle +++ b/backend/app/build.gradle @@ -152,6 +152,10 @@ dependencies { implementation(project(':security')) } +configurations { + all*.exclude group: 'com.vaadin.external.google', module: 'android-json' +} + test { useJUnitPlatform() maxHeapSize = "2048m" diff --git a/backend/data/build.gradle b/backend/data/build.gradle index f4050cc5da..551806de7e 100644 --- a/backend/data/build.gradle +++ b/backend/data/build.gradle @@ -171,6 +171,10 @@ dependencies { implementation(project(':misc')) } +configurations { + all*.exclude group: 'com.vaadin.external.google', module: 'android-json' +} + test { useJUnitPlatform() maxHeapSize = "2048m" diff --git a/backend/testing/build.gradle b/backend/testing/build.gradle index 4a27beb378..3252ea2537 100644 --- a/backend/testing/build.gradle +++ b/backend/testing/build.gradle @@ -57,8 +57,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-validation" implementation("org.springframework.boot:spring-boot-starter-security") implementation 'org.springframework.boot:spring-boot-starter-mail' - implementation('org.springframework.boot:spring-boot-starter-test') { - } + implementation('org.springframework.boot:spring-boot-starter-test') kapt "org.springframework.boot:spring-boot-configuration-processor" implementation "org.springframework.boot:spring-boot-configuration-processor" api "org.springframework.boot:spring-boot-starter-actuator" @@ -101,6 +100,10 @@ dependencies { implementation 'org.postgresql:postgresql' } +configurations { + all*.exclude group: 'com.vaadin.external.google', module: 'android-json' +} + test { useJUnitPlatform() maxHeapSize = "2048m" diff --git a/build.gradle b/build.gradle index ea304c7a0a..a6b4bcfafa 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ project(':server-app').afterEvaluate { task check { dependsOn project(':server-app').tasks.findByName("check") - dependsOn project(':server-app').tasks.findByName("ktlintCheck") + dependsOn ktlintCheckAll } task bootJar { @@ -98,13 +98,20 @@ project(':server-app').afterEvaluate { finalizedBy.add(stopDbChangelogContainer) - doFirst { project(':server-app').bootRun.systemProperty('spring.profiles.active', 'dbschema') } } } +task ktlintCheckAll(group: "Verification", description: "Runs the ktlint on all projects") { + dependsOn getTasksByName("ktlintCheck", true) +} + +task ktlintFormatAll(group: "Formatting", description: "Runs the ktlint formatter on all projects") { + dependsOn getTasksByName("ktlintFormat", true) +} + subprojects { task allDeps(type: DependencyReportTask) {} } diff --git a/ee/backend/tests/build.gradle b/ee/backend/tests/build.gradle index dbbe0c56b4..8e9b06b5bc 100644 --- a/ee/backend/tests/build.gradle +++ b/ee/backend/tests/build.gradle @@ -42,6 +42,10 @@ dependencies { testImplementation libs.jacksonModuleKotlin } +configurations { + all*.exclude group: 'com.vaadin.external.google', module: 'android-json' +} + kotlin { jvmToolchain(11) }