Commit d4022450 authored by NicolaiO's avatar NicolaiO 🐼 Committed by TIGERs GitLab
Browse files

Resolve "Improve build and pipeline performance"

Closes #1697

See merge request main/Sumatra!1466

sumatra-commit: 28d2200fe6e929a1234b016553689bdda59a6d2b
parent 93636259
Pipeline #17221 failed with stage
in 1 minute and 51 seconds
......@@ -7,6 +7,7 @@ plugins {
id 'jacoco'
id 'idea'
id 'ca.cutterslade.analyze'
id 'sumatra.version-conventions'
}
sourceCompatibility = JavaVersion.VERSION_11
......@@ -49,12 +50,20 @@ jacocoTestReport {
exclude: ['**/proto/**/*'])
}))
}
dependsOn(test)
}
dependencies {
annotationProcessor "org.projectlombok:lombok:1.18.20"
compileOnly "org.projectlombok:lombok:1.18.20"
permitUnusedDeclared "org.projectlombok:lombok:1.18.20"
annotationProcessor "org.projectlombok:lombok:1.18.22"
compileOnly "org.projectlombok:lombok:1.18.22"
permitUnusedDeclared "org.projectlombok:lombok:1.18.22"
}
analyzeClassesDependencies {
// Set to false until up-to-date check works again (bug in plugin)
logDependencyInformationToFiles = false
}
analyzeTestClassesDependencies {
// Set to false until up-to-date check works again (bug in plugin)
logDependencyInformationToFiles = false
}
\ No newline at end of file
......@@ -8,7 +8,7 @@ plugins {
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.17.0'
artifact = 'com.google.protobuf:protoc:3.19.0'
}
// https://github.com/google/protobuf/issues/2054
generateProtoTasks {
......
plugins {
id 'com.github.ben-manes.versions'
id 'se.patrikerdes.use-latest-versions'
}
def isNonStable = { String version ->
def stableKeyword = ['RELEASE', 'FINAL', 'GA', 'JRE'].any { it -> version.toUpperCase().contains(it) }
def regex = /^[0-9v]{1,3}\.([0-9,.v-]|(groovy))+(-r)?$/
return !stableKeyword && !(version ==~ regex)
}
dependencyUpdates {
rejectVersionIf {
isNonStable(it.candidate.version)
}
}
useLatestVersions {
updateBlacklist = []
}
......@@ -15,5 +15,5 @@ dependencies {
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.assertj:assertj-core:3.21.0'
}
......@@ -20,10 +20,10 @@ dependencies {
implementation 'net.jafama:jafama:2.3.2'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.6'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.7.2'
testImplementation 'com.google.guava:guava:30.1.1-jre'
testImplementation 'com.google.guava:guava:31.0.1-jre'
testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.14.1'
}
......@@ -26,10 +26,10 @@ dependencies {
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'org.openjdk.jmh:jmh-core:1.31'
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.31'
testImplementation 'org.openjdk.jmh:jmh-core:1.33'
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.33'
}
task runBangBangTrajectoryBenchmark(type: JavaExec) {
......
......@@ -32,12 +32,12 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'com.google.guava:guava:30.1.1-jre'
implementation 'commons-io:commons-io:2.8.0'
implementation 'com.google.guava:guava:31.0.1-jre'
implementation 'commons-io:commons-io:2.11.0'
implementation 'commons-lang:commons-lang:2.6'
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.google.protobuf:protobuf-java:3.17.0'
implementation 'com.google.protobuf:protobuf-java:3.19.0'
integrationTestImplementation project(':common')
......@@ -49,19 +49,19 @@ dependencies {
integrationTestImplementation project(':moduli-record')
integrationTestImplementation 'junit:junit:4.13.2'
integrationTestImplementation 'org.assertj:assertj-core:3.19.0'
integrationTestImplementation 'com.google.protobuf:protobuf-java:3.17.0'
integrationTestImplementation 'com.google.protobuf:protobuf-java-util:3.17.0'
integrationTestImplementation 'org.assertj:assertj-core:3.21.0'
integrationTestImplementation 'com.google.protobuf:protobuf-java:3.19.0'
integrationTestImplementation 'com.google.protobuf:protobuf-java-util:3.19.0'
integrationTestImplementation 'com.github.g3force:configurable:3.0'
integrationTestImplementation 'org.apache.logging.log4j:log4j-api:2.14.1'
integrationTestRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.14.1'
integrationTestRuntimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.14.1'
integrationTestRuntimeOnly 'org.slf4j:slf4j-log4j12:1.7.30'
integrationTestRuntimeOnly 'org.slf4j:slf4j-log4j12:1.7.32'
integrationTestAnnotationProcessor "org.projectlombok:lombok:1.18.20"
integrationTestImplementation "org.projectlombok:lombok:1.18.20"
integrationTestAnnotationProcessor "org.projectlombok:lombok:1.18.22"
integrationTestImplementation "org.projectlombok:lombok:1.18.22"
integrationTestImplementation project(':sumatra-gamelog')
integrationTestImplementation project(':moduli-cam-logfile')
......@@ -78,3 +78,8 @@ task integrationTest(type: Test) {
// inspired by: https://blog.gradle.org/stop-rerunning-tests
inputs.property "integration.date", System.currentTimeSeconds()
}
analyzeIntegrationTestClassesDependencies {
// Set to false until up-to-date check works again (bug in plugin)
logDependencyInformationToFiles = false
}
......@@ -21,7 +21,7 @@ dependencies {
implementation 'org.apache.commons:commons-collections4:4.4'
implementation 'org.apache.commons:commons-math3:3.6.1'
api 'com.google.protobuf:protobuf-java:3.17.0'
api 'com.google.protobuf:protobuf-java:3.19.0'
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
......
......@@ -23,5 +23,5 @@ dependencies {
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.assertj:assertj-core:3.21.0'
}
......@@ -18,9 +18,9 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'commons-io:commons-io:2.8.0'
implementation 'commons-io:commons-io:2.11.0'
implementation 'commons-lang:commons-lang:2.6'
implementation 'net.lingala.zip4j:zip4j:2.7.0'
implementation 'net.lingala.zip4j:zip4j:2.9.0'
implementation 'com.sleepycat:je:18.3.12'
}
......@@ -34,13 +34,13 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'commons-io:commons-io:2.8.0'
implementation 'commons-io:commons-io:2.11.0'
api 'com.google.protobuf:protobuf-java:3.17.0'
api 'com.google.protobuf:protobuf-java:3.19.0'
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.assertj:assertj-core:3.21.0'
runtimeOnly "com.github.TIGERs-Mannheim:ssl-game-controller-maven:2.12.8.1:${osClassifier}"
}
......@@ -30,9 +30,9 @@ dependencies {
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
api 'com.google.protobuf:protobuf-java:3.17.0'
api 'com.google.protobuf:protobuf-java:3.19.0'
implementation 'commons-codec:commons-codec:1.15'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.assertj:assertj-core:3.21.0'
testImplementation 'junit:junit:4.13.2'
}
......@@ -17,6 +17,6 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
api 'com.google.protobuf:protobuf-java:3.17.0'
implementation 'com.google.guava:guava:30.1.1-jre'
api 'com.google.protobuf:protobuf-java:3.19.0'
implementation 'com.google.guava:guava:31.0.1-jre'
}
......@@ -23,6 +23,6 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'commons-io:commons-io:2.8.0'
implementation 'commons-io:commons-io:2.11.0'
implementation 'commons-lang:commons-lang:2.6'
}
......@@ -7,8 +7,6 @@ plugins {
id 'java-library'
}
import org.apache.tools.ant.filters.*
dependencies {
api 'com.github.TIGERs-Mannheim:moduli:4.1'
......@@ -17,10 +15,3 @@ dependencies {
implementation 'commons-configuration:commons-configuration:1.10'
}
processResources {
inputs.property("project.version", rootProject.version)
filter ReplaceTokens, tokens: [
"application.version": rootProject.version,
]
}
#
# Copyright (c) 2009 - 2020, DHBW Mannheim - TIGERs Mannheim
#
version=@application.version@
\ No newline at end of file
......@@ -18,5 +18,5 @@ dependencies {
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.assertj:assertj-core:3.21.0'
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment