Prefer using from over inheritFrom (#1723)

Author: Goooler

docs/configuration/README.md

@@ -122,7 +122,7 @@ Inspecting the `META-INF/MANIFEST.MF` entry in the JAR file will reveal the foll
 Class-Path: /libs/foo.jar
 ```
 
-If it is desired to inherit a manifest from a JAR task other than the standard [`Jar`][Jar] task, the `inheritFrom`
+If it is desired to inherit a manifest from a JAR task other than the standard [`Jar`][Jar] task, the `from`
 methods on the `shadowJar.manifest` object can be used to configure the upstream.
 
 === "Kotlin"
@@ -135,7 +135,7 @@ methods on the `shadowJar.manifest` object can be used to configure the upstream
     }
 
     tasks.shadowJar {
-      manifest.inheritFrom(testJar.get().manifest)
+      manifest.from(testJar.get().manifest)
     }
     ```
 
@@ -149,7 +149,7 @@ methods on the `shadowJar.manifest` object can be used to configure the upstream
     }
 
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
-      manifest.inheritFrom(testJar.get().manifest)
+      manifest.from(testJar.get().manifest)
     }
     ```
 

src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginsTest.kt

@@ -724,7 +724,7 @@ class JavaPluginsTest : BasePluginTest() {
           }
         }
         $shadowJarTask {
-          manifest.inheritFrom(testJar.get().manifest)
+          manifest.from(testJar.get().manifest)
         }
       """.trimIndent(),
     )

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/InheritManifest.kt

@@ -5,10 +5,14 @@ import org.gradle.api.java.archives.Manifest
 import org.gradle.api.java.archives.ManifestMergeSpec
 
 @Deprecated(
-  message = "This is deprecated and will be removed in a future release. `inheritFrom` should be replaced by `from`.",
+  message = "This is deprecated and will be removed in a future release.",
   replaceWith = ReplaceWith("Manifest", "org.gradle.api.java.archives.Manifest"),
 )
 public interface InheritManifest : Manifest {
+  @Deprecated(
+    message = "This is deprecated and will be removed in a future release.",
+    replaceWith = ReplaceWith("from"),
+  )
   public fun inheritFrom(vararg inheritPaths: Any) {
     inheritFrom(inheritPaths = inheritPaths, action = {})
   }