diff --git a/game/build.gradle b/game/build.gradle index ac4d3f1c..1a451eb9 100644 --- a/game/build.gradle +++ b/game/build.gradle @@ -28,7 +28,7 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: junitVersion testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: powermockVersion - testImplementation group: 'org.powermock', name: 'powermock-api-mockito', version: powermockVersion + testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: powermockVersion testImplementation group: 'org.assertj', name: 'assertj-core', version: assertjVersion project(":game:plugin").subprojects { pluginProject -> diff --git a/game/plugin-detekt-rules/build.gradle b/game/plugin-detekt-rules/build.gradle index a57e036c..2a459bb6 100644 --- a/game/plugin-detekt-rules/build.gradle +++ b/game/plugin-detekt-rules/build.gradle @@ -4,6 +4,7 @@ apply from: "$rootDir/gradle/kotlin.gradle" dependencies { api group: 'io.gitlab.arturbosch.detekt', name: 'detekt-api', version: detektVersion + api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8' test.useJUnitPlatform() testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}") diff --git a/gradle/properties.gradle b/gradle/properties.gradle index 76f3789d..63d32988 100644 --- a/gradle/properties.gradle +++ b/gradle/properties.gradle @@ -2,7 +2,7 @@ ext { kotlinVersion = '1.3.40' kotlinxCoroutinesVersion = '1.3.0-M2' junitVersion = '4.12' - powermockVersion = '1.6.4' + powermockVersion = '2.0.2' bouncycastleVersion = '1.54' c3p0Version = '0.9.5.2' scryptVersion = '1.4.0' diff --git a/gradle/testing.gradle b/gradle/testing.gradle index 838454d4..5b3a7cd1 100644 --- a/gradle/testing.gradle +++ b/gradle/testing.gradle @@ -10,7 +10,7 @@ gradle.projectsEvaluated { apply plugin: "jacoco" jacoco { - toolVersion = '0.8.1' + toolVersion = '0.8.4' } test { diff --git a/gradle/wrapper.gradle b/gradle/wrapper.gradle index 35e4d7dd..19b869f7 100644 --- a/gradle/wrapper.gradle +++ b/gradle/wrapper.gradle @@ -1,3 +1,3 @@ wrapper { - gradleVersion = "4.9" + gradleVersion = "5.5" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a95009c3..ce16fd39 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Jul 16 03:37:52 BST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip diff --git a/net/build.gradle b/net/build.gradle index 939c6ff4..0b1045c3 100644 --- a/net/build.gradle +++ b/net/build.gradle @@ -11,6 +11,7 @@ dependencies { implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: bouncycastleVersion test.useJUnitPlatform() + testImplementation group: 'junit', name: 'junit', version: junitVersion testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion diff --git a/util/build.gradle b/util/build.gradle index 99694627..aa4fb376 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -10,6 +10,7 @@ dependencies { implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: bouncycastleVersion test.useJUnitPlatform() + testImplementation group: 'junit', name: 'junit', version: junitVersion testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion