Merge pull request #427 from apollo-rsps/bugfix/jdk-11

Update test deps for Java 11

.travis.yml

@@ -1,20 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-
-addons:
-  sonarcloud:
-    organization: "apollo-rsps"
-
-after_success:
-  - ./gradlew jacocoTestReport
-  - bash <(curl -s https://codecov.io/bash)
-  - git fetch --unshallow
-  - ./gradlew -Dsonar.host.url=https://sonarcloud.io -Dsonar.login="$SONAR_TOKEN" sonarqube
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/

appveyor.yml

@@ -1,24 +0,0 @@
-version: "{branch} {build}"
-
-build:
-  verbosity: detailed
-
-build_script:
-- gradlew.bat assemble --info --no-daemon
-
-test_script:
-- gradlew.bat check --info --no-daemon
-
-cache:
-- C:\Users\appveyor\.gradle
-
-environment:
-  matrix:
-  - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-
-matrix:
-  fast_finish: true
-
-artifacts:
-- path: 'game\build\distributions\game-0.0.1.zip'
-  name: Apollo Server Distribution

azure-pipelines.yml

@@ -0,0 +1,47 @@
+pool:
+  vmImage: 'ubuntu-latest'
+
+variables:
+  GRADLE_USER_HOME: $(Pipeline.Workspace)/.gradle
+
+steps:
+  - task: CacheBeta@0
+    inputs:
+      key: $(Agent.OS)
+      path: $(GRADLE_USER_HOME)
+    displayName: "Gradle: setup build cache"
+
+  - task: SonarCloudPrepare@1
+    inputs:
+      SonarCloud: 'apollo-rsps-sonarcloud'
+      organization: 'apollo-rsps'
+      scannerMode: 'Other'
+    displayName: "SonarCloud: prepare analysis"
+
+  - task: Gradle@2
+    displayName: "Gradle: build"
+    inputs:
+      workingDirectory: ''
+      gradleWrapperFile: 'gradlew'
+      gradleOptions: '-Xmx3072m -Dorg.gradle.parallel=true -Dorg.gradle.caching=true -Dsonar.host.url=https://sonarcloud.io'
+      javaHomeOption: 'JDKVersion'
+      jdkVersionOption: '1.8'
+      jdkArchitectureOption: 'x64'
+      publishJUnitResults: true
+      testResultsFiles: '**/TEST-*.xml'
+      tasks: 'check jacocoTestReport sonarqube'
+
+  - script: |
+      ./gradlew --stop
+    displayName: "Gradle: stop daemon"
+
+  - task: SonarCloudPublish@1
+    inputs:
+      pollingTimeoutSec: '300'
+    displayName: "SonarCloud: publish quality gate"
+
+  - script: |
+      bash <(curl -s https://codecov.io/bash) -t "${CODECOV_TOKEN}"
+    env:
+      CODECOV_TOKEN: $(CODECOV_TOKEN)
+    displayName: "Codecov: publish coverage"

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 ->

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}")

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'

gradle/testing.gradle

@@ -10,7 +10,7 @@ gradle.projectsEvaluated {
         apply plugin: "jacoco"
 
         jacoco {
-            toolVersion = '0.8.1'
+            toolVersion = '0.8.4'
         }
 
         test {

gradle/wrapper.gradle

@@ -1,3 +1,3 @@
 wrapper {
-    gradleVersion = "4.9"
+    gradleVersion = "5.5"
 }

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

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

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