2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-02 16:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update test deps for Java 11

Browse Source 
Prevent bytecode generation related test failures in tests that rely on
PowerMock by updating to PowerMock 2.
This commit is contained in:
Gary Tierney
2019-07-16 16:35:32 +01:00
parent 1b3f1ab5c4
commit 57fc49a42b
8 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/build.gradle
+1 -1
View File
@@ -28,7 +28,7 @@ dependencies {
testImplementation group: 'junit', name: 'junit', version: junitVersion testImplementation group: 'junit', name: 'junit', version: junitVersion
testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: powermockVersion 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 testImplementation group: 'org.assertj', name: 'assertj-core', version: assertjVersion
project(":game:plugin").subprojects { pluginProject -> project(":game:plugin").subprojects { pluginProject ->
game/plugin-detekt-rules/build.gradle
+1
View File
@@ -4,6 +4,7 @@ apply from: "$rootDir/gradle/kotlin.gradle"
dependencies { dependencies {
api group: 'io.gitlab.arturbosch.detekt', name: 'detekt-api', version: detektVersion api group: 'io.gitlab.arturbosch.detekt', name: 'detekt-api', version: detektVersion
api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
test.useJUnitPlatform() test.useJUnitPlatform()
testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}") testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
gradle/properties.gradle
+1 -1
View File
@@ -2,7 +2,7 @@ ext {
kotlinVersion = '1.3.40' kotlinVersion = '1.3.40'
kotlinxCoroutinesVersion = '1.3.0-M2' kotlinxCoroutinesVersion = '1.3.0-M2'
junitVersion = '4.12' junitVersion = '4.12'
powermockVersion = '1.6.4' powermockVersion = '2.0.2'
bouncycastleVersion = '1.54' bouncycastleVersion = '1.54'
c3p0Version = '0.9.5.2' c3p0Version = '0.9.5.2'
scryptVersion = '1.4.0' scryptVersion = '1.4.0'
gradle/testing.gradle
+1 -1
View File
@@ -10,7 +10,7 @@ gradle.projectsEvaluated {
apply plugin: "jacoco" apply plugin: "jacoco"
jacoco { jacoco {
toolVersion = '0.8.1' toolVersion = '0.8.4'
} }
test { test {
gradle/wrapper.gradle
+1 -1
View File
@@ -1,3 +1,3 @@
wrapper { wrapper {
gradleVersion = "4.9" gradleVersion = "5.5"
} }
gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -1
View File
@@ -1,5 +1,6 @@
#Tue Jul 16 03:37:52 BST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
net/build.gradle
+1
View File
@@ -11,6 +11,7 @@ dependencies {
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: bouncycastleVersion implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: bouncycastleVersion
test.useJUnitPlatform() 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-api', version: junitJupiterVersion
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion
util/build.gradle
+1
View File
@@ -10,6 +10,7 @@ dependencies {
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: bouncycastleVersion implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: bouncycastleVersion
test.useJUnitPlatform() 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-api', version: junitJupiterVersion
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion