Project stack update (#366)

* Gradle and plugins updated

Co-authored-by: szymon.owczarzak <[email protected]>

build.gradle.kts

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 plugins {
+    id("java-library")
     id("com.bmuschko.docker-remote-api")
-    id("java")
-    id("io.gitlab.arturbosch.detekt") version "1.1.0"
+    id("io.gitlab.arturbosch.detekt") version "1.16.0"
     id("io.knotx.distribution")
 }
 
@@ -27,7 +27,13 @@ defaultTasks("redeployLocal")
 
 dependencies {
     subprojects.forEach { "dist"(project(":${it.name}")) }
-    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.1.0")
+    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0")
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
 }
 
 allprojects {
@@ -53,7 +59,6 @@ detekt {
     config.from(file("detekt.yml"))
     parallel = true
     autoCorrect = true
-    failFast = true
 }
 
 apply(from = "gradle/javaAndUnitTests.gradle.kts")

buildSrc/build.gradle.kts

@@ -14,8 +14,8 @@ repositories {
 }
 
 dependencies {
-    implementation("com.moowork.gradle:gradle-node-plugin:1.2.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
-    implementation("com.bmuschko:gradle-docker-plugin:6.1.2")
+    implementation("com.moowork.gradle:gradle-node-plugin:1.3.1")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32")
+    implementation("com.bmuschko:gradle-docker-plugin:6.7.0")
     implementation("io.knotx:knotx-gradle-plugins:0.1.4")
 }

cogboard-app/src/main/kotlin/com/cognifide/cogboard/widget/type/sonarqube/SonarQubeWidget.kt

@@ -66,7 +66,7 @@ class SonarQubeWidget(
                 .stream()
                 .map { it as String }
                 .forEach { metricName ->
-                    metrics.list
+                    (metrics.list as List<*>)
                             .stream()
                             .map { it as JsonObject }
                             .filter {
@@ -79,7 +79,7 @@ class SonarQubeWidget(
     }
 
     private fun extractStatus(metrics: JsonArray): Widget.Status {
-        return metrics.list
+        return (metrics.list as List<*>)
                 .stream()
                 .map { it as JsonObject }
                 .filter { it.getString(version.getMetricKey()) == "alert_status" }

cogboard-webapp/build.gradle.kts

@@ -7,10 +7,10 @@ plugins {
     id("com.bmuschko.docker-remote-api")
 }
 
-node {
-    version = "10.16.0"
-    download = true
-}
+//node {
+//    version = "10.16.0"
+//    download = true
+//}
 
 val reactAppDestPath = "${rootProject.rootDir}/cogboard-app/src/main/resources"
 tasks {

detekt.yml

@@ -70,7 +70,8 @@ complexity:
     threshold: 60
   LongParameterList:
     active: true
-    threshold: 6
+    functionThreshold: 6
+    constructorThreshold: 6
     ignoreDefaultParameters: false
   MethodOverloading:
     active: false
@@ -116,7 +117,7 @@ empty-blocks:
     active: true
   EmptyFunctionBlock:
     active: true
-    ignoreOverriddenFunctions: false
+    ignoreOverridden: false
   EmptyIfBlock:
     active: true
   EmptyInitBlock:
@@ -322,15 +323,15 @@ naming:
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     parameterPattern: "[a-z][A-Za-z0-9]*"
     excludeClassPattern: "$^"
-    ignoreOverriddenFunctions: true
+    ignoreOverridden: true
   InvalidPackageDeclaration:
     active: false
     rootPackage: ""
   MatchingDeclarationName:
     active: true
   MemberNameEqualsClassName:
     active: false
-    ignoreOverriddenFunction: true
+    ignoreOverridden: true
   ObjectPropertyNaming:
     active: true
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
@@ -461,7 +462,7 @@ style:
   MagicNumber:
     active: true
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
-    ignoreNumbers: "-1,0,1,2"
+    ignoreNumbers: "-1,0,1,2,9,10,100"
     ignoreHashCodeFunction: true
     ignorePropertyDeclaration: false
     ignoreConstantDeclaration: true

gradle.properties

@@ -1,5 +1,8 @@
 version=1.0.4
 
+# JDK
+javaSupport.version=8
+
 # Knot.x Docker image version (https://hub.docker.com/r/knotx/knotx)
 knotx.version=2.1.0
 knotx.conf=knotx

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists