Merge remote-tracking branch 'origin/main' into kotlin-rewrite

GradleUp · Oct 15, 2024 · a7337e6 · a7337e6
2 parents f05644e + c1b5ef3
commit a7337e6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,7 +39,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_KEY_PASSWORD }}
       - name: Extract release notes
         # TODO: replace this after https://github.com/ffurrer2/extract-release-notes/pull/355 is merged.
-        uses: Goooler/extract-release-notes@5b05257f66951e271f7758b9e734d3f1e13ba8e9
+        uses: Goooler/extract-release-notes@6e686e7a607d03716b7cff561371a82065b22c33
         with:
           changelog_file: src/docs/changes/README.md
           release_notes_file: RELEASE_NOTES.md

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
 
 dependencies {
   implementation("com.gradle.publish:plugin-publish-plugin:1.3.0")
-  implementation("com.vanniktech:gradle-maven-publish-plugin:0.29.0")
+  implementation("com.vanniktech:gradle-maven-publish-plugin:0.30.0")
   implementation("org.ajoberstar.git-publish:gradle-git-publish:4.2.2")
   implementation("com.github.node-gradle:gradle-node-plugin:7.1.0")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
   compileOnly(localGroovy())
 
   implementation("org.jdom:jdom2:2.0.6.1")
-  implementation("org.ow2.asm:asm-commons:9.7")
+  implementation("org.ow2.asm:asm-commons:9.7.1")
   implementation("commons-io:commons-io:2.17.0")
   implementation("org.apache.ant:ant:1.10.15")
   implementation("org.codehaus.plexus:plexus-utils:4.0.2")
@@ -55,8 +55,8 @@ dependencies {
   testImplementation("xmlunit:xmlunit:1.6")
   testImplementation("org.apache.commons:commons-lang3:3.17.0")
   testImplementation("com.google.guava:guava:33.3.1-jre")
-  testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.1")
-  testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.11.1")
+  testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2")
+  testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.11.2")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 

diff --git a/src/docs/.vuepress/config.js b/src/docs/.vuepress/config.js
@@ -4,6 +4,7 @@ module.exports = {
   ga: "UA-321220-4",
   themeConfig: {
     repo: "GradleUp/shadow",
+    docsBranch: 'main',
     editLinks: true,
     editLinkText: 'Help improve these docs!',
     logo: '/logo+type.svg',

diff --git a/src/docs/custom-tasks/README.md b/src/docs/custom-tasks/README.md
@@ -12,11 +12,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 task testJar(type: ShadowJar) {
   archiveClassifier.set("tests")
   from sourceSets.test.output
-  configurations = [project.configurations.testImplementation]
+  configurations = [project.configurations.testRuntimeClasspath]
 }
 ```
 
-The code snippet above will generate a shadowed JAR containing both the `main` and `test` sources as well as all `runtime`
+The code snippet above will generate a shadowed JAR containing both the `main` and `test` sources as well as all `testRuntimeOnly`
 and `testImplementation` dependencies.
 The file is output to `build/libs/<project>-<version>-tests.jar`.