chore(deps): update dependency gradle to v7 (#2598)

* chore(deps): update dependency gradle to v7 * remove deprecated functions #2592 * update kotlin logging package #2592 * add duplicatesStrategy #2592 * remove deprecated baseName #2592 * replace jCentral with mavenCentral #2592 Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: IhsenBouallegue <[email protected]> Co-authored-by: Ihsen Bouallegue <[email protected]>
MaibornWolff · Jan 12, 2022 · 7f2723f · 7f2723f
1 parent d126a28
commit 7f2723f
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 44 deletions.
diff --git a/analysis/build.gradle b/analysis/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         json_schema_version = '1.14.0'
         json_version = '20190722'
         juniversalchardet_version = '1.0.3'
-        kotlin_logging_version = '1.12.5'
+        kotlin_logging_version = '2.1.21'
         kotlin_version = '1.6.10'
         kotlinx_coroutines_version = '1.6.0'
         picocli_version = '4.6.2'
@@ -39,7 +39,7 @@ buildscript {
     }
 
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://plugins.gradle.org/m2/'
         }
@@ -64,7 +64,7 @@ allprojects {
     repositories.addAll(rootProject.getBuildscript().getRepositories())
 
     apply plugin: 'jacoco'
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
     apply plugin: "org.jlleitschuh.gradle.ktlint"
 
     jacoco {
@@ -83,7 +83,7 @@ subprojects {
 
         testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
         testImplementation("org.junit.jupiter:junit-jupiter-api:$junit5_version")
-        testRuntime("org.junit.jupiter:junit-jupiter-engine:$junit5_version")
+        testImplementation("org.junit.jupiter:junit-jupiter-engine:$junit5_version")
         testImplementation("org.junit.jupiter:junit-jupiter-params:$junit5_version")
         testImplementation "com.natpryce:hamkrest:$hamkrest_version"
 
@@ -119,7 +119,7 @@ subprojects {
 
 distributions {
     main {
-        baseName = 'codecharta-analysis'
+        distributionBaseName  = 'codecharta-analysis'
         contents {
             from { '../LICENSE.md' }
             from { '../CHANGELOG.md' }

diff --git a/analysis/filter/EdgeFilter/build.gradle b/analysis/filter/EdgeFilter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation group: 'io.fastjson', name: 'boon', version: boon_version
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
 
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: hamcrest_version
     testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-test', version: kotlin_version
@@ -30,4 +30,4 @@ test {
     useJUnitPlatform {
         includeEngines 'spek2'
     }
-}
+}
diff --git a/analysis/gradle/wrapper/gradle-wrapper.properties b/analysis/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 
 #Wed Sep 23 13:22:07 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

diff --git a/analysis/import/CSVImporter/build.gradle b/analysis/import/CSVImporter/build.gradle
@@ -12,7 +12,8 @@ dependencies {
     implementation group: 'io.fastjson', name: 'boon', version: boon_version
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+
     testImplementation group: 'org.assertj', name: 'assertj-core', version: assertj_version
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: junit5_version
     testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-test', version: kotlin_version

diff --git a/analysis/import/CodeMaatImporter/build.gradle b/analysis/import/CodeMaatImporter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation group: 'io.fastjson', name: 'boon', version: boon_version
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
 
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: junit5_version
     testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-test', version: kotlin_version

diff --git a/analysis/import/SCMLogParser/build.gradle b/analysis/import/SCMLogParser/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
     implementation group: 'com.googlecode.juniversalchardet', name: 'juniversalchardet', version: juniversalchardet_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
 
     testImplementation group: 'junit', name: 'junit', version: junit4_version
     testImplementation group: 'org.assertj', name: 'assertj-core', version: assertj_version

diff --git a/analysis/import/SCMLogParserV2/build.gradle b/analysis/import/SCMLogParserV2/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
     implementation group: 'com.googlecode.juniversalchardet', name: 'juniversalchardet', version: juniversalchardet_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
 
     testImplementation group: 'junit', name: 'junit', version: junit4_version
     testImplementation group: 'org.assertj', name: 'assertj-core', version: assertj_version
@@ -19,4 +19,4 @@ dependencies {
 
 test {
     useJUnitPlatform()
-}
+}
diff --git a/analysis/import/SonarImporter/build.gradle b/analysis/import/SonarImporter/build.gradle
@@ -8,9 +8,9 @@ dependencies {
     implementation group: 'info.picocli', name: 'picocli', version: picocli_version
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
-    runtime group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jersey_version
-    runtime group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jersey_version
+    implementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
 
     testImplementation group: 'junit', name: 'junit', version: junit4_version
     testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version: hamcrest_version

diff --git a/analysis/import/SourceCodeParser/build.gradle b/analysis/import/SourceCodeParser/build.gradle
@@ -1,14 +1,14 @@
 dependencies {
     implementation project(':model')
     implementation project(':filter:MergeFilter')
-    
+
     implementation group: 'info.picocli', name: 'picocli', version: picocli_version
     implementation group: 'org.sonarsource.java', name: 'sonar-java-plugin', version: sonar_java_version
     implementation group: 'org.json', name: 'json', version: json_version
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version
     implementation group: 'javax.xml.bind', name: 'jaxb-api', version: jaxb_api_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
 
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: junit5_version
     testImplementation group: 'org.assertj', name: 'assertj-core', version: assertj_version
@@ -19,4 +19,4 @@ dependencies {
 
 test {
     useJUnitPlatform()
-}
+}
diff --git a/analysis/import/TokeiImporter/build.gradle b/analysis/import/TokeiImporter/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
     implementation group: 'com.google.code.gson', name: 'gson', version: gson_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
 
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: junit5_version
     testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-test', version: kotlin_version

diff --git a/analysis/import/UnderstandImporter/build.gradle b/analysis/import/UnderstandImporter/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation group: 'io.fastjson', name: 'boon', version: boon_version
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
 
   testImplementation group: 'org.assertj', name: 'assertj-core', version: assertj_version
   testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: junit5_version

diff --git a/analysis/model/build.gradle b/analysis/model/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version
     implementation group: 'io.github.microutils', name: 'kotlin-logging-jvm', version: '2.1.21'
 
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
+    implementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j_version
 
     testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-test', version: kotlin_version
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: hamcrest_version

diff --git a/analysis/tools/ccsh/build.gradle b/analysis/tools/ccsh/build.gradle
@@ -17,7 +17,7 @@ fi
 '''
 
 dependencies {
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
+    implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
 
     def codeMaatImporter = project(':import:CodeMaatImporter')
     def crococosmoImporter = project(':import:CrococosmoImporter')
@@ -36,38 +36,39 @@ dependencies {
     def csvExporter = project(':export:CSVExporter')
     def rawTextParser = project(':parser:RawTextParser')
 
-    // first compile is for dependency in main, testCompile is so our test suite can find all other tests
-    compile codeMaatImporter; testCompile codeMaatImporter.sourceSets.test.output
-    compile crococosmoImporter; testCompile crococosmoImporter.sourceSets.test.output
-    compile csvImporter; testCompile csvImporter.sourceSets.test.output
-    compile jasomeImporter; testCompile jasomeImporter.sourceSets.test.output
-    compile scmlogParser; testCompile scmlogParser.sourceSets.test.output
-    compile scmlogParserV2; testCompile scmlogParserV2.sourceSets.test.output
-    compile sonarImporter; testCompile sonarImporter.sourceSets.test.output
-    compile sourceCodeParser; testCompile sourceCodeParser.sourceSets.test.output
-    compile tokeiImporter; testCompile tokeiImporter.sourceSets.test.output
-    compile understandImporter; testCompile understandImporter.sourceSets.test.output
-    compile mergeFilter; testCompile mergeFilter.sourceSets.test.output
-    compile edgeFilter; testCompile edgeFilter.sourceSets.test.output
-    compile validationTool; testCompile validationTool.sourceSets.test.output
-    compile csvExporter; testCompile csvExporter.sourceSets.test.output
-    compile structureModifier; testCompile structureModifier.sourceSets.test.output
-    compile rawTextParser; testCompile rawTextParser.sourceSets.test.output
+    // first implementation is for dependency in main, testImplementation is so our test suite can find all other tests
+    implementation codeMaatImporter; testImplementation codeMaatImporter.sourceSets.test.output
+    implementation crococosmoImporter; testImplementation crococosmoImporter.sourceSets.test.output
+    implementation csvImporter; testImplementation csvImporter.sourceSets.test.output
+    implementation jasomeImporter; testImplementation jasomeImporter.sourceSets.test.output
+    implementation scmlogParser; testImplementation scmlogParser.sourceSets.test.output
+    implementation scmlogParserV2; testImplementation scmlogParserV2.sourceSets.test.output
+    implementation sonarImporter; testImplementation sonarImporter.sourceSets.test.output
+    implementation sourceCodeParser; testImplementation sourceCodeParser.sourceSets.test.output
+    implementation tokeiImporter; testImplementation tokeiImporter.sourceSets.test.output
+    implementation understandImporter; testImplementation understandImporter.sourceSets.test.output
+    implementation mergeFilter; testImplementation mergeFilter.sourceSets.test.output
+    implementation edgeFilter; testImplementation edgeFilter.sourceSets.test.output
+    implementation validationTool; testImplementation validationTool.sourceSets.test.output
+    implementation csvExporter; testImplementation csvExporter.sourceSets.test.output
+    implementation structureModifier; testImplementation structureModifier.sourceSets.test.output
+    implementation rawTextParser; testImplementation rawTextParser.sourceSets.test.output
 
     implementation group: 'info.picocli', name: 'picocli', version: picocli_version
 
     testImplementation group: 'junit', name: 'junit', version: junit4_version
     testImplementation group: 'org.assertj', name: 'assertj-core', version: assertj_version
 
-    testCompile("org.junit.platform:junit-platform-runner:$junit_platform_version")
+    testImplementation("org.junit.platform:junit-platform-runner:$junit_platform_version")
 }
 
 jar {
-    baseName = "${applicationName}"
+    archiveBaseName = "${applicationName}"
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes 'Main-Class': mainClassName,
                 'Implementation-Title': 'CodeCharta ccsh',
-                'Implementation-Version': version
+                'Implementation-Version': archiveVersion
     }
     zip64 true
     exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists