Merge branch 'master' into feature/test-enchantment#1571

saveourtool · Mar 27, 2023 · ca2f562 · ca2f562
2 parents 48ff515 + ae84613
commit ca2f562
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 30 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 kotlin = "1.8.10"
 serialization = "1.5.0"
 ktlint = "0.46.1"
-junit = "5.9.1"
-junit-platfrom = "1.9.1"
+junit = "5.9.2"
+junit-platfrom = "1.9.2"
 guava = "31.1-jre"
 commons-cli = "1.5.0"
 commons-io = "2.11.0"
@@ -12,14 +12,15 @@ detekt = "1.22.0"
 dokka = "1.7.20"
 jacoco = "0.8.8"
 # maven
-maven-api = "3.8.6"
-maven-plugin-tools = "3.7.0"
+maven-api = "3.9.1"
+maven-plugin-tools = "3.8.1"
 maven-plugin-testing-harness = "3.3.0"
 plexus = "2.0"
 
 jbool = "1.24"
 # downgraded to be compliance with ktlint
 mu-logging = "2.1.23"
+# downgraded to be compliance with ktlint
 kaml = "0.47.0"
 kotlin-multiplatform-diff = "0.4.0"
 sarif4k = "0.3.0"
@@ -53,7 +54,7 @@ kotlinx-cli = "0.3.5"
 spotless = "6.17.0"
 arrow-kt = "1.1.5"
 publish = "1.3.0"
-download = "5.3.1"
+download = "5.4.0"
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

diff --git a/renovate.json b/renovate.json
@@ -11,7 +11,7 @@
       "groupSlug": "all-github-actions"
     },
     {
-      "managers": ["maven"],
+      "managers": ["gradle"],
       "matchPackagePatterns": [
         "*"
       ],
@@ -27,71 +27,55 @@
       "groupSlug": "all-minor-patch"
     },
     {
-      "managers": ["maven", "gradle"],
+      "managers": ["gradle"],
       "matchPackagePatterns": [
         "^org\\.jetbrains\\.kotlin[.:]"
       ],
       "groupName": "Kotlin core dependencies",
       "groupSlug": "core-kotlin"
     },
     {
-      "managers": ["maven"],
+      "managers": ["gradle"],
       "matchPackagePatterns": [
         "^com\\.pinterest\\.ktlint[.:]"
       ],
       "groupName": "Ktlint",
       "groupSlug": "ktlint"
     },
     {
-      "managers": ["maven"],
+      "managers": ["gradle"],
       "matchPackageNames": [
         "org.sonatype.plugins:nexus-staging-maven-plugin"
       ],
       "allowedVersions": "<= 1.6.8 || > 1.6.13"
     },
     {
-      "managers": ["maven"],
+      "managers": ["gradle"],
       "matchPackageNames": [
         "io.github.microutils:kotlin-logging-jvm"
       ],
       "allowedVersions": "<= 2.1.23"
     },
     {
-      "managers": ["maven"],
+      "managers": ["gradle"],
       "matchPackageNames": [
           "com.charleskorn.kaml:kaml-jvm"
       ],
       "allowedVersions": "<= 0.47.0"
     },
     {
-      "managers": ["maven"],
+      "managers": ["gradle"],
       "matchPackageNames": [
         "org.apache.maven.plugins:maven-plugin-plugin"
       ],
       "allowedVersions": "< 3.7.0"
     },
     {
-      "managers": ["maven"],
+      "managers": ["gradle"],
       "matchPackageNames": [
         "org.apache.maven.plugin-tools:maven-plugin-annotations"
       ],
       "allowedVersions": "< 3.7.0"
-    },
-    {
-      "managers": ["gradle"],
-      "matchPackagePatterns": [
-        "*"
-      ],
-      "excludePackagePatterns": [
-        "^org\\.jetbrains\\.kotlin[.:]",
-        "^com\\.pinterest\\.ktlint[.:]"
-      ],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ],
-      "groupName": "all dependencies in gradle scripts",
-      "groupSlug": "all-gradle-dependencies"
     }
   ]
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,7 +28,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.enterprise") version "3.12.4"
+    id("com.gradle.enterprise") version "3.12.6"
 }
 
 includeBuild("gradle/plugins")