Commit 7207abd2 authored by MarkG's avatar MarkG Committed by TIGERs GitLab
Browse files

Resolve "Upgrade to Gradle 7 for JDK 16 support"

Closes #1617

See merge request main/Sumatra!1357

sumatra-commit: 7d4a6af8526db377decaf7c7c94a6d308f470d43
parent b31bd7af
Pipeline #8853 passed with stage
in 7 minutes and 15 seconds
......@@ -17,7 +17,7 @@ repositories {
url = 'https://nexus.tigers-mannheim.de/content/groups/public/'
}
jcenter()
mavenCentral()
maven {
url = 'https://jitpack.io/'
......@@ -33,7 +33,7 @@ test {
}
jacoco {
toolVersion = "0.8.5"
toolVersion = "0.8.7"
}
jacocoTestReport {
......@@ -54,7 +54,7 @@ jacocoTestReport {
}
dependencies {
annotationProcessor "org.projectlombok:lombok:1.18.12"
compileOnly "org.projectlombok:lombok:1.18.12"
permitUnusedDeclared "org.projectlombok:lombok:1.18.12"
annotationProcessor "org.projectlombok:lombok:1.18.20"
compileOnly "org.projectlombok:lombok:1.18.20"
permitUnusedDeclared "org.projectlombok:lombok:1.18.20"
}
\ No newline at end of file
......@@ -8,7 +8,7 @@ plugins {
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.14.0'
artifact = 'com.google.protobuf:protoc:3.17.0'
}
// https://github.com/google/protobuf/issues/2054
generateProtoTasks {
......
......@@ -22,6 +22,6 @@ dependencies {
implementation 'com.github.g3force:configurable:3.0'
implementation 'commons-lang:commons-lang:2.6'
implementation 'com.miglayout:miglayout-swing:5.2'
implementation 'com.miglayout:miglayout-swing:11.0'
implementation 'net.sf.jchart2d:jchart2d:3.3.2'
}
......@@ -14,6 +14,6 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13'
testImplementation 'org.assertj:assertj-core:3.16.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
}
......@@ -14,5 +14,5 @@ dependencies {
implementation 'com.github.g3force:String2ValueConverter:2.2'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'com.miglayout:miglayout-swing:5.2'
implementation 'com.miglayout:miglayout-swing:11.0'
}
......@@ -17,8 +17,8 @@ dependencies {
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'com.miglayout:miglayout-swing:5.2'
implementation 'com.miglayout:miglayout-core:5.2'
implementation 'com.miglayout:miglayout-swing:11.0'
implementation 'com.miglayout:miglayout-core:11.0'
}
......@@ -13,17 +13,17 @@ dependencies {
implementation 'org.apache.commons:commons-math3:3.6.1'
implementation 'commons-lang:commons-lang:2.6'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'com.sleepycat:je:18.3.12'
api 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'net.jafama:jafama:2.3.1'
implementation 'net.jafama:jafama:2.3.2'
testImplementation 'junit:junit:4.13'
testImplementation 'org.assertj:assertj-core:3.16.1'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.4.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.6'
testImplementation 'com.google.guava:guava:29.0-jre'
testImplementation 'com.google.guava:guava:30.1.1-jre'
testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.13.3'
testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.14.1'
}
......@@ -16,20 +16,20 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'org.apache.commons:commons-math3:3.6.1'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-core:2.13.3'
annotationProcessor 'org.apache.logging.log4j:log4j-core:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
annotationProcessor 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'com.sleepycat:je:18.3.12'
implementation 'gov.nist.math:jama:1.0.3'
implementation 'net.jafama:jafama:2.3.1'
implementation 'net.jafama:jafama:2.3.2'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
testImplementation 'junit:junit:4.13'
testImplementation 'org.assertj:assertj-core:3.16.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.openjdk.jmh:jmh-core:1.23'
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.23'
testImplementation 'org.openjdk.jmh:jmh-core:1.31'
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.31'
}
task runBangBangTrajectoryBenchmark(type: JavaExec) {
......
......@@ -29,15 +29,15 @@ dependencies {
implementation 'com.github.g3force:configurable:3.0'
api 'com.github.g3force:instanceables:5.2'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'com.google.guava:guava:29.0-jre'
implementation 'commons-io:commons-io:2.7'
implementation 'com.google.guava:guava:30.1.1-jre'
implementation 'commons-io:commons-io:2.8.0'
implementation 'commons-lang:commons-lang:2.6'
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.google.protobuf:protobuf-java:3.12.2'
implementation 'com.google.protobuf:protobuf-java:3.17.0'
integrationTestImplementation project(':common')
......@@ -48,21 +48,20 @@ dependencies {
integrationTestImplementation project(':moduli-referee')
integrationTestImplementation project(':moduli-record')
integrationTestImplementation 'junit:junit:4.13'
integrationTestImplementation 'org.assertj:assertj-core:3.16.1'
integrationTestImplementation 'com.google.protobuf:protobuf-java-util:3.15.8'
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 'com.github.TIGERs-Mannheim:moduli:4.1'
integrationTestImplementation 'com.github.g3force:configurable:3.0'
integrationTestImplementation 'com.github.g3force:instanceables:5.2'
integrationTestImplementation 'org.apache.logging.log4j:log4j-api:2.13.3'
integrationTestImplementation 'org.apache.logging.log4j:log4j-core:2.13.3'
integrationTestImplementation 'org.apache.logging.log4j:log4j-1.2-api:2.13.3'
integrationTestImplementation 'org.slf4j:slf4j-log4j12:1.7.30'
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'
integrationTestAnnotationProcessor "org.projectlombok:lombok:1.18.12"
integrationTestImplementation "org.projectlombok:lombok:1.18.12"
integrationTestAnnotationProcessor "org.projectlombok:lombok:1.18.20"
integrationTestImplementation "org.projectlombok:lombok:1.18.20"
integrationTestImplementation project(':sumatra-gamelog')
integrationTestImplementation project(':moduli-cam-logfile')
......
......@@ -16,7 +16,7 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'com.github.g3force:configurable:3.0'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'commons-configuration:commons-configuration:1.10'
}
......@@ -15,15 +15,15 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'com.github.g3force:configurable:3.0'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'org.apache.commons:commons-collections4:4.4'
implementation 'org.apache.commons:commons-math3:3.6.1'
api 'com.google.protobuf:protobuf-java:3.12.2'
api 'com.google.protobuf:protobuf-java:3.17.0'
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
testImplementation 'junit:junit:4.13'
testImplementation 'junit:junit:4.13.2'
}
......@@ -16,12 +16,12 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'com.github.g3force:configurable:3.0'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'commons-lang:commons-lang:2.6'
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13'
testImplementation 'org.assertj:assertj-core:3.16.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
}
......@@ -15,12 +15,12 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'com.github.g3force:configurable:3.0'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-core:2.13.3'
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.7'
implementation 'commons-io:commons-io:2.8.0'
implementation 'commons-lang:commons-lang:2.6'
implementation 'net.lingala.zip4j:zip4j:2.6.1'
implementation 'net.lingala.zip4j:zip4j:2.7.0'
implementation 'com.sleepycat:je:18.3.12'
}
......@@ -30,17 +30,17 @@ dependencies {
implementation 'com.github.g3force:configurable:3.0'
implementation 'com.github.g3force:instanceables:5.2'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'commons-lang:commons-lang:2.6'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'commons-io:commons-io:2.7'
implementation 'commons-io:commons-io:2.8.0'
api 'com.google.protobuf:protobuf-java:3.12.2'
api 'com.google.protobuf:protobuf-java:3.17.0'
implementation 'com.sleepycat:je:18.3.12'
testImplementation 'junit:junit:4.13'
testImplementation 'org.assertj:assertj-core:3.16.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
runtimeOnly "com.github.TIGERs-Mannheim:ssl-game-controller-maven:2.6.2.1:${osClassifier}"
runtimeOnly "com.github.TIGERs-Mannheim:ssl-game-controller-maven:2.7.3.0:${osClassifier}"
}
......@@ -37,6 +37,7 @@ public class SimilarityChecker
}
@SuppressWarnings("unchecked")
public boolean isSimilar(IGameEvent e1, IGameEvent e2)
{
if (!e1.getClass().equals(e2.getClass()))
......@@ -47,7 +48,6 @@ public class SimilarityChecker
{
return false;
}
//noinspection unchecked
return map.getOrDefault(e1.getClass(), Collections.emptyList()).stream().allMatch(c -> c.isSimilar(e1, e2));
}
......
......@@ -23,7 +23,7 @@ dependencies {
implementation 'org.apache.commons:commons-collections4:4.4'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'com.sleepycat:je:18.3.12'
}
......@@ -26,13 +26,13 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'commons-configuration:commons-configuration:1.10'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'com.sleepycat:je:18.3.12'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
api 'com.google.protobuf:protobuf-java:3.12.2'
implementation 'commons-codec:commons-codec:1.14'
api 'com.google.protobuf:protobuf-java:3.17.0'
implementation 'commons-codec:commons-codec:1.15'
testImplementation 'org.assertj:assertj-core:3.16.1'
testImplementation 'junit:junit:4.13'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'junit:junit:4.13.2'
}
......@@ -15,8 +15,8 @@ dependencies {
implementation 'com.github.TIGERs-Mannheim:moduli:4.1'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
api 'com.google.protobuf:protobuf-java:3.12.2'
implementation 'com.google.guava:guava:29.0-jre'
api 'com.google.protobuf:protobuf-java:3.17.0'
implementation 'com.google.guava:guava:30.1.1-jre'
}
......@@ -12,8 +12,8 @@ dependencies {
implementation project(':common-gui')
implementation project(':sumatra-model')
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-core:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'org.apache.logging.log4j:log4j-core:2.14.1'
implementation 'com.miglayout:miglayout-swing:5.2'
implementation 'com.miglayout:miglayout-swing:11.0'
}
......@@ -18,7 +18,7 @@ dependencies {
implementation 'commons-lang:commons-lang:2.6'
implementation 'org.apache.logging.log4j:log4j-api:2.13.3'
implementation 'org.apache.logging.log4j:log4j-api:2.14.1'
implementation 'com.miglayout:miglayout-swing:5.2'
implementation 'com.miglayout:miglayout-swing:11.0'
}
Supports Markdown
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