Skip to content

Commit

Permalink
WIP [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
fprochazka committed Oct 29, 2023
1 parent 587a7d6 commit 64ec0e9
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 4 deletions.
4 changes: 4 additions & 0 deletions backend/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ dependencies {
implementation(project(':security'))
}

configurations {
all*.exclude group: 'com.vaadin.external.google', module: 'android-json'
}

test {
useJUnitPlatform()
maxHeapSize = "2048m"
Expand Down
4 changes: 4 additions & 0 deletions backend/data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ dependencies {
implementation(project(':misc'))
}

configurations {
all*.exclude group: 'com.vaadin.external.google', module: 'android-json'
}

test {
useJUnitPlatform()
maxHeapSize = "2048m"
Expand Down
7 changes: 5 additions & 2 deletions backend/testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -101,6 +100,10 @@ dependencies {
implementation 'org.postgresql:postgresql'
}

configurations {
all*.exclude group: 'com.vaadin.external.google', module: 'android-json'
}

test {
useJUnitPlatform()
maxHeapSize = "2048m"
Expand Down
11 changes: 9 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {}
}
Expand Down
4 changes: 4 additions & 0 deletions ee/backend/tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ dependencies {
testImplementation libs.jacksonModuleKotlin
}

configurations {
all*.exclude group: 'com.vaadin.external.google', module: 'android-json'
}

kotlin {
jvmToolchain(11)
}
Expand Down

0 comments on commit 64ec0e9

Please sign in to comment.