Merge branch 'release/2.0.0'

.gitlab-ci.yml

@@ -11,7 +11,7 @@ include:
     file: 'common/sonarqube.gitlab-ci.yml'
   - project: 'integrator1/devops/gitlab-ci-jobs'
     ref: master
-    file: 'common/build-gradle.gitlab-ci.yml'    
+    file: 'common/build-gradle.gitlab-ci.yml'
 
 stages:
   - tests
@@ -22,15 +22,15 @@ stages:
     expire_in: 1 week
     name: "${CI_COMMIT_SHORT_SHA}_${CI_JOB_ID}"
     reports:
-      junit: "**/test-results/test/*.xml"  
+      junit: "**/test-results/test/*.xml"
     paths:
       - "**/build/reports/detekt/detekt.xml"
       - "**/test-results/test/*.xml"
       - "**/build/jacocoReports/test/jacocoTestReport.xml"
-      - images.json  
+      - images.json
       - "**/build/libs"
 
-# check code quality 
+# check code quality
 code_quality:
   extends:
     - .check_code_quality
@@ -39,10 +39,11 @@ code_quality:
     - dev
     - merge_requests
     - /^.*rc.*$/
-    - /^.*release.*$/    
+    - /^.*release.*$/
     - /^.*hotfix.*$/
-    
+
 tests&build:
+  image: $CI_REGISTRY/integrator/devops/openjdk-17-slim-docker:d837de0d
   extends:
     - .test-gradle
   script:
@@ -51,23 +52,25 @@ tests&build:
   only:
     - dev
     - /^.*rc.*$/
-    - /^.*release.*$/    
+    - /^.*release.*$/
     - /^.*hotfix.*$/
   <<: *artifacts
 
 tests&build_for_maven_central:
+  image: $CI_REGISTRY/integrator/devops/openjdk-17-slim-docker:d837de0d
   extends:
     - .test-gradle
   script:
     - cat $we_maven_central_gpg | base64 --decode > "$(pwd)/we_maven_central.gpg"
     - ./gradlew --no-parallel -PsonaTypeMavenUser=$SONATYPE_USER -PsonaTypeMavenPassword=$SONATYPE_PASSWORD -Psigning.keyId=$SIGN_KEY_ID -Psigning.password=$SIGN_PASSWORD -Psigning.secretKeyRingFile="$(pwd)/we_maven_central.gpg" version check build publish
-    - ./gradlew -PsonaTypeMavenUser=$SONATYPE_USER -PsonaTypeMavenPassword=$SONATYPE_PASSWORD closeAndReleaseRepository
+    - ./gradlew -PsonaTypeMavenUser=$SONATYPE_USER -PsonaTypeMavenPassword=$SONATYPE_PASSWORD closeAndReleaseStagingRepository
     - ./samples/take_root_version_for_build.sh
   only:
     - master
   <<: *artifacts
 
 tests-mr:
+  image: $CI_REGISTRY/integrator/devops/openjdk-17-slim-docker:d837de0d
   extends:
     - .test-mr-gradle
   script:
@@ -80,4 +83,4 @@ tests-mr:
     - git merge origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
     - ./gradlew -PweMavenUser=$MAVEN_USER -PweMavenPassword=$MAVEN_PASSWORD check build
     - docker images --format "{{json . }}" --no-trunc > images.json
-  <<: *artifacts 
+  <<: *artifacts

build.gradle.kts

@@ -4,9 +4,9 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
+val detektVersion: String by project
+
 val kotlinVersion: String by project
-val kotlinCoroutinesVersion: String by project
-val reactorVersion: String by project
 val springCloudVersion: String by project
 val jacocoToolVersion: String by project
 val logbackVersion: String by project
@@ -22,9 +22,6 @@ val protobufVersion: String by project
 
 val junitVersion: String by project
 val mockkVersion: String by project
-val springMockkVersion: String by project
-
-val ktorVersion: String by project
 
 val weNodeClientVersion: String by project
 
@@ -45,10 +42,9 @@ plugins {
     kotlin("jvm") apply false
     `maven-publish`
     signing
-    id("io.codearte.nexus-staging")
+    id("io.github.gradle-nexus.publish-plugin")
     id("io.spring.dependency-management") apply false
-    id("io.gitlab.arturbosch.detekt") apply false
-    id("org.jlleitschuh.gradle.ktlint") apply false
+    id("io.gitlab.arturbosch.detekt")
     id("com.palantir.git-version") apply false
     id("com.gorylenko.gradle-git-properties") apply false
     id("fr.brouillard.oss.gradle.jgitver")
@@ -87,10 +83,17 @@ allprojects {
 }
 
 
-nexusStaging {
-    serverUrl = "$sonaTypeBasePath/service/local/"
-    username = sonaTypeMavenUser
-    password = sonaTypeMavenPassword
+if (sonaTypeMavenUser != null && sonaTypeMavenUser != null) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri("$sonaTypeBasePath/service/local/"))
+                snapshotRepositoryUrl.set(uri("$sonaTypeBasePath/content/repositories/snapshots/"))
+                username.set(sonaTypeMavenUser)
+                password.set(sonaTypeMavenPassword)
+            }
+        }
+    }
 }
 
 subprojects {
@@ -143,11 +146,14 @@ configure(
     apply(plugin = "io.spring.dependency-management")
     apply(plugin = "kotlin")
     apply(plugin = "io.gitlab.arturbosch.detekt")
-    apply(plugin = "org.jlleitschuh.gradle.ktlint")
     apply(plugin = "jacoco")
     apply(plugin = "signing")
     apply(plugin = "org.jetbrains.dokka")
 
+    dependencies {
+        detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion")
+    }
+
     val jacocoCoverageFile = "$buildDir/jacocoReports/test/jacocoTestReport.xml"
 
     tasks.withType<JacocoReport> {
@@ -184,6 +190,23 @@ configure(
         buildUponDefaultConfig = true
     }
 
+    tasks.register<Detekt>("detektFormat") {
+        description = "Runs detekt with auto-correct to format the code."
+        group = "formatting"
+        autoCorrect = true
+        exclude("resources/")
+        exclude("build/")
+        config.setFrom(detektConfigFilePath)
+        setSource(
+            files(
+                "src/main/java",
+                "src/test/java",
+                "src/main/kotlin",
+                "src/test/kotlin",
+            )
+        )
+    }
+
     val sourcesJar by tasks.creating(Jar::class) {
         group = JavaBasePlugin.DOCUMENTATION_GROUP
         description = "Assembles sources JAR"
@@ -263,7 +286,6 @@ configure(
             mavenBom("com.wavesenterprise:we-node-client-bom:$weNodeClientVersion")
 
             mavenBom("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion")
-            mavenBom("org.jetbrains.kotlinx:kotlinx-coroutines-bom:$kotlinCoroutinesVersion")
             mavenBom("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
             mavenBom("io.grpc:grpc-bom:$ioGrpcVersion")
 
@@ -277,7 +299,6 @@ configure(
             dependency("org.apache.commons:commons-lang3:$commonsLangVersion")
 
             dependency("io.mockk:mockk:$mockkVersion")
-            dependency("com.ninja-squad:springmockk:$springMockkVersion")
             dependency("com.frimastudio:slf4j-kotlin-extensions:$sl4jExtVersion")
         }
     }
@@ -288,13 +309,12 @@ configure(
                 "-Xjsr305=strict",
                 "-Xjvm-default=all", // todo move to api only
             )
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
-            targetCompatibility = JavaVersion.VERSION_1_8.toString()
+            jvmTarget = JavaVersion.VERSION_17.toString()
         }
     }
 
     jacoco {
         toolVersion = jacocoToolVersion
-        reportsDirectory.set(file("$buildDir/jacocoReports"))
+        reportsDirectory.set(layout.buildDirectory.dir("jacocoReports").get().asFile)
     }
 }

gradle.properties

@@ -6,36 +6,33 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # Build plugins
-gradleDependencyManagementVersion=1.0.8.RELEASE
-detektVersion=1.19.0
-ktlintVersion=10.2.1
-gitPropertiesVersion=2.2.2
-palantirGitVersion=0.12.2
-jacocoToolVersion=0.8.8
+gradleDependencyManagementVersion=1.1.5
+detektVersion=1.23.6
+gitPropertiesVersion=2.4.1
+palantirGitVersion=3.1.0
+jacocoToolVersion=0.8.12
 jGitVerVersion=0.9.1
-dokkaVersion=1.6.21
-nexusStagingVersion=0.30.0
+dokkaVersion=1.9.20
+nexusPublishVersion=2.0.0
 
 # Core infrastructure libs versions
-kotlinVersion=1.6.21
-kotlinCoroutinesVersion=1.6.1
+kotlinVersion=1.9.23
 logbackVersion=1.2.11
 sl4jExtVersion=2.0.0
 javaxAnnotationApiVersion=1.3.2
 commonsLangVersion=3.12.0
-jacksonVersion=2.13.2
+jacksonVersion=2.17.1
 guavaVersion=31.1-jre
 
 # Grpc
-ioGrpcVersion=1.20.0
+ioGrpcVersion=1.64.0
 
 # Testing
-junitVersion=5.8.2
-mockkVersion=1.12.3
-springMockkVersion=3.1.1
+junitVersion=5.10.2
+mockkVersion=1.13.11
 
 # WE SDK
-weNodeClientVersion=1.4.1
+weNodeClientVersion=2.0.0
 
 # GitHub properties
 gitHubProject = "waves-enterprise/we-contract-sdk"