Merge remote-tracking branch 'origin/main' into g/20260106/bump-gradle

Goooler · Goooler · commit cb21c1840feb · 2026-01-06T10:21:12.000+08:00
diff --git a/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt b/src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/TransformersTest.kt
@@ -344,7 +344,7 @@ class TransformersTest : BaseTransformerTest() {
       )
       getContent(customNoticeEntry).isEqualTo(
         """
-          Copyright 2006-2025 The Apache Software Foundation
+          Copyright 2006-2026 The Apache Software Foundation
 
           This product includes software developed at
           The Apache Software Foundation (https://www.apache.org/).

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ class TransformersTest : BaseTransformerTest() {`
`344`	`344`	`)`
`345`	`345`	`getContent(customNoticeEntry).isEqualTo(`
`346`	`346`	`"""`
`347`		`- Copyright 2006-2025 The Apache Software Foundation`
	`347`	`+ Copyright 2006-2026 The Apache Software Foundation`
`348`	`348`
`349`	`349`	`This product includes software developed at`
`350`	`350`	`The Apache Software Foundation (https://www.apache.org/).`