Merge 0b83194 into a19ffe9

build.gradle

@@ -1,10 +1,13 @@
 buildscript {
     // set a valid scala suffix for the buildscript itself
-    project.ext.scalaSuffix = '_2.11'
+    project.ext.scalaSuffix = '_2.12'
     apply from: file("${rootDir}/versionInfo.gradle")
 
     repositories {
 		jcenter()
+        maven {
+            url  "https://dl.bintray.com/ngbinh/maven"
+        }
     }
 
     dependencies {
@@ -13,7 +16,7 @@ buildscript {
         classpath "com.netflix.nebula:gradle-git-scm-plugin:${versions.nebulaGit}"
         classpath "com.netflix.nebula:nebula-release-plugin:${versions.nebulaRelease}"
         classpath "com.netflix.nebula:nebula-publishing-plugin:${versions.nebulaPublish}"
-        classpath "org.ajoberstar:grgit:${versions.gradleGit}"
+        classpath "org.ajoberstar.grgit:grgit-gradle:${versions.gradleGit}"
         classpath "org.github.ngbinh.scalastyle:gradle-scalastyle-plugin${project.scalaSuffix}:${versions.scalaStyle}"
         classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:${versions.coveralls}"
         classpath "org.scoverage:gradle-scoverage:${versions.gradleScoverage}"
@@ -56,34 +59,31 @@ targetCompatibility = 1.8
 
 // keep in alphabetical order
 dependencies {
-    compile "com.google.code.gson:gson:${versions.gson}"
-    compile "com.google.guava:guava:${versions.guava}"
-    compile "com.google.inject:guice:${versions.guice}"
-    compile "com.typesafe:config:${versions.typesafeConfig}"
-    compile "com.typesafe.slick:slick_%%:${versions.slick}"
-    compile "com.typesafe.slick:slick-hikaricp_%%:${versions.slick}"
-    compile "commons-io:commons-io:${versions.commonsIo}"
+    implementation "com.google.code.gson:gson:${versions.gson}"
+    implementation "com.google.guava:guava:${versions.guava}"
+    implementation "com.google.inject:guice:${versions.guice}"
+    implementation "com.typesafe:config:${versions.typesafeConfig}"
+    implementation "com.typesafe.slick:slick_%%:${versions.slick}"
+    implementation "com.typesafe.slick:slick-hikaricp_%%:${versions.slick}"
+    implementation "commons-io:commons-io:${versions.commonsIo}"
     // Could not exclude concrete logger implementation due to it being directly used within gatling-app
-    compile "io.gatling:gatling-app:${versions.gatling}"
-    compile "io.gatling:gatling-core:${versions.gatling}"
-    compile "io.gatling:gatling-http:${versions.gatling}"
-    compile "junit:junit:${versions.junit}"
-    compile "org.apache.commons:commons-configuration2:${versions.commonsConfiguration2}"
-    compile "org.apache.commons:commons-math3:${versions.math3}"
-    compile "org.flywaydb:flyway-core:${versions.flyway}"
-    compile "org.influxdb:influxdb-java:${versions.influxDbClient}"
-    compile "org.scala-lang:scala-library:%scala-version%"
-    compile "org.scala-lang:scala-reflect:%scala-version%"
-    compile "org.scalactic:scalactic_%%:${versions.scalactic}"
-    compile "org.scalatest:scalatest_%%:${versions.scalatest}"
-    compile "org.tinylog:tinylog:${versions.tinylog}"
-
-    compile files(org.gradle.internal.jvm.Jvm.current().toolsJar)
-
-    testCompile "io.gatling:gatling-commons:${versions.gatling}"
-
-    scoverage "org.scoverage:scalac-scoverage-plugin_%%:${versions.scalacScoverage}"
-    scoverage "org.scoverage:scalac-scoverage-runtime_%%:${versions.scalacScoverage}"
+    implementation "io.gatling:gatling-app:${versions.gatling}"
+    implementation "io.gatling:gatling-core:${versions.gatling}"
+    implementation "io.gatling:gatling-http:${versions.gatling}"
+    implementation "junit:junit:${versions.junit}"
+    implementation "org.apache.commons:commons-configuration2:${versions.commonsConfiguration2}"
+    implementation "org.apache.commons:commons-math3:${versions.math3}"
+    implementation "org.flywaydb:flyway-core:${versions.flyway}"
+    implementation "org.influxdb:influxdb-java:${versions.influxDbClient}"
+    implementation "org.scala-lang:scala-library:%scala-version%"
+    implementation "org.scala-lang:scala-reflect:%scala-version%"
+    implementation "org.scalactic:scalactic_%%:${versions.scalactic}"
+    implementation "org.scalatest:scalatest_%%:${versions.scalatest}"
+    implementation "org.tinylog:tinylog:${versions.tinylog}"
+
+    implementation files(org.gradle.internal.jvm.Jvm.current().toolsJar)
+
+    testImplementation "io.gatling:gatling-commons:${versions.gatling}"
 
     runtimeOnly "com.h2database:h2:${versions.h2}"
     runtimeOnly "commons-beanutils:commons-beanutils:${versions.beanUtils}"
@@ -125,19 +125,19 @@ processResources {
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from sourceSets.main.allSource
 }
 
 // fake javadoc jar to pass sonatype rules
 // See https://central.sonatype.org/pages/requirements.html
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from new File('javadoc-fake')
 }
 
 task scaladocJar(type: Jar) {
-    classifier = 'scaladoc'
+    archiveClassifier = 'scaladoc'
     from scaladoc.destinationDir
 }
 
@@ -176,16 +176,6 @@ test {
     }
 }
 
-testScoverage {
-    minHeapSize = "500m"
-    maxHeapSize = "8g"
-
-    testLogging {
-        events 'started', 'passed'
-        showStandardStreams = true
-    }
-}
-
 task deleteSchema(type: JavaExec, dependsOn: compileTestScala) {
     description = "deletes the db schema prior to running tests"
     main = "com.workday.warp.persistence.DropCoreSchema"
@@ -241,18 +231,24 @@ scoverage {
     // Excluding autogenerated Tables
     excludedPackages = ["com.workday.warp.persistence.model", "com.workday.warp.examples"]
     excludedFiles = []
-}
 
-// Defaults: 75% of Statements. Other types of coverage: Line, Branch
-checkScoverage {
-    coverageType = 'Statement'
+    // Default Coverage Type is "Statement"
     minimumRate = 0.92
 }
 
 coveralls {
     coberturaReportPath = "${buildDir}/reports/scoverage/cobertura.xml"
 }
 
+
+// current workaround nebula incremental analysis failure
+// see: https://github.com/gradle/gradle/issues/6854
+configurations.all {
+    if (name.startsWith("incrementalScalaAnalysis")) {
+        extendsFrom = []
+    }
+}
+
 /**
  * @return true iff we are building a maven snapshot or a devSnapshot.
  */