General testing code clean-ups

azure-pipelines.yml

@@ -11,6 +11,16 @@ steps:
       path: $(GRADLE_USER_HOME)
     displayName: "Gradle: setup build cache"
 
+  - task: DownloadPackage@1
+    inputs:
+      packageType: 'upack'
+      feed: '/76852042-5a8d-4247-969f-47caba0cae08'
+      view: '56ddc552-069b-4fda-9122-46a634ec7e8a'
+      definition: '301d6f40-3540-4afb-abcb-cf9be945c859'
+      version: '1.0.0-377'
+      downloadPath: '$(Build.SourcesDirectory)/game/data/fs/377'
+    displayName: "Misc: download cache data"
+
   - task: SonarCloudPrepare@1
     inputs:
       SonarCloud: 'apollo-rsps-sonarcloud'
@@ -29,7 +39,7 @@ steps:
       jdkArchitectureOption: 'x64'
       publishJUnitResults: true
       testResultsFiles: '**/TEST-*.xml'
-      tasks: 'check jacocoTestReport sonarqube'
+      tasks: 'check jacocoReport sonarqube'
 
   - script: |
       ./gradlew --stop

build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.3.41' apply(false)
     id 'org.jetbrains.intellij' version '0.4.9' apply(false)
-    id 'org.jmailen.kotlinter' version '1.26.0' apply(false)
     id 'org.sonarqube' version '2.7.1'
     id "io.gitlab.arturbosch.detekt" version '1.0.0-RC16'
 }
@@ -17,7 +16,6 @@ allprojects {
     }
 }
 
-apply from: 'gradle/properties.gradle'
 apply from: 'gradle/code-quality.gradle'
 apply from: 'gradle/testing.gradle'
 apply from: 'gradle/wrapper.gradle'

gradle.properties

@@ -0,0 +1,18 @@
+kotlinVersion=1.3.40
+kotlinxCoroutinesVersion=1.3.0-M2
+junitVersion=4.12
+powermockVersion=2.0.2
+bouncycastleVersion=1.54
+c3p0Version=0.9.5.2
+scryptVersion=1.4.0
+nettyVersion=4.0.34.Final
+guavaVersion=19.0
+commonsCompressVersion=1.10
+assertjVersion=3.8.0
+classGraphVersion=4.0.6
+junitVintageVersion=5.1.0
+junitPlatformVersion=1.1.0
+junitJupiterVersion=5.1.0
+mockkVersion=1.7.15
+assertkVersion=0.9
+detektVersion=1.0.0-RC16

gradle/code-quality.gradle

@@ -15,5 +15,9 @@ detekt {
 sonarqube {
     properties {
         property "sonar.kotlin.detekt.reportPaths", detektAggregateReport
+        property "sonar.organization", "apollo-rsps"
+        property "sonar.projectKey", "apollo:org.apollo"
+        property "sonar.projectName", "Apollo RSPS"
+        property "sonar.kotlin.file.suffixes", ".kt,.kts"
     }
 }

gradle/testing.gradle

@@ -36,9 +36,9 @@ gradle.projectsEvaluated {
 
 
     task jacocoReport(type: JacocoReport) {
-        sourceDirectories = files()
-        classDirectories = files()
-        executionData = files()
+        sourceDirectories.setFrom(files())
+        classDirectories.setFrom(files())
+        executionData.setFrom(files())
 
         reports {
             html.enabled = true
@@ -63,19 +63,9 @@ gradle.projectsEvaluated {
                 additionalClassDirs((FileCollection) subproject.sourceSets.main.output)
             }
 
-            executionData = files(jacocoCoverageAggregate)
+            executionData.setFrom(files(jacocoCoverageAggregate))
         }
 
         dependsOn(jacocoMerge)
     }
-
-    sonarqube {
-        properties {
-            property "sonar.organization", "apollo-rsps"
-            property "sonar.projectKey", "apollo:org.apollo"
-            property "sonar.projectName", "Apollo RSPS"
-            property "sonar.kotlin.file.suffixes", ".kt,.kts"
-            property "sonar.jacoco.reportPaths", jacocoCoverageAggregate
-        }
-    }
 }