adapt for new gradle

Author: XiaoPangxie732

build.gradle

@@ -3,18 +3,17 @@ plugins {
     id 'groovy'
 
     id 'maven-publish'
-    id 'com.gradle.plugin-publish' version '0.9.10'
+    id 'com.gradle.plugin-publish' version '0.15.0'
 
-    id 'net.minecrell.licenser' version '0.4.1'
+    id 'org.cadixdev.licenser' version '0.6.1'
 }
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
-
-group = 'org.cadixdev.gradle'
+group = 'cn.maxpixel.gradle'
 version = '0.10.0-SNAPSHOT'
 description = 'A Gradle plugin to manage patches for Git repositories'
 
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+
 dependencies {
     implementation gradleApi()
 }
@@ -37,21 +36,20 @@ task groovydocJar(type: Jar, dependsOn: groovydoc) {
 gradlePlugin {
     plugins {
         gitpatcher {
-            id = 'org.cadixdev.gitpatcher'
+            id = 'cn.maxpixel.gitpatcher'
             implementationClass = 'org.cadixdev.gradle.gitpatcher.GitPatcher'
         }
     }
 }
 
 pluginBundle {
-    website = 'https://github.com/CadixDev/gitpatcher'
+    website = 'https://github.com/MaxPixelStudios/gitpatcher'
     vcsUrl = website
     description = project.description
     tags = ['git']
 
     plugins {
-        gitpatcherPlugin {
-            id = 'org.cadixdev.gitpatcher'
+        gitpatcher {
             displayName = 'gitpatcher'
         }
     }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -33,14 +33,14 @@ import org.gradle.api.Project
 class GitPatcher implements Plugin<Project> {
 
     protected Project project
-    protected PatchExtension extension
+    protected PatchExtension patchExtension
 
     @Override
     void apply(Project project) {
         this.project = project
         project.with {
-            this.extension = extensions.create('patches', PatchExtension)
-            extension.root = projectDir
+            this.patchExtension = extensions.create('patches', PatchExtension)
+            patchExtension.root = projectDir
 
             task('findGit', type: FindGitTask)
             task('updateSubmodules', type: UpdateSubmodulesTask, dependsOn: 'findGit')
@@ -49,24 +49,24 @@ class GitPatcher implements Plugin<Project> {
 
             afterEvaluate {
                 // Configure the settings from our extension
-                tasks.findGit.submodule = extension.submodule
+                tasks.findGit.submodule = patchExtension.submodule
 
                 configure([tasks.applyPatches, tasks.makePatches]) {
-                    repo = extension.target
-                    root = extension.root
-                    submodule = extension.submodule
-                    patchDir = extension.patches
+                    repo = patchExtension.target
+                    root = patchExtension.root
+                    submodule = patchExtension.submodule
+                    patchDir = patchExtension.patches
                 }
 
                 tasks.makePatches.with {
-                    formatPatchArgs = extension.formatPatchArgs
+                    formatPatchArgs = patchExtension.formatPatchArgs
                 }
 
                 tasks.applyPatches.updateTask = tasks.updateSubmodules
 
                 tasks.updateSubmodules.with {
-                    repo = extension.root
-                    submodule = extension.submodule
+                    repo = patchExtension.root
+                    submodule = patchExtension.submodule
                 }
             }
         }
@@ -76,8 +76,8 @@ class GitPatcher implements Plugin<Project> {
         return project
     }
 
-    PatchExtension getExtension() {
-        return extension
+    PatchExtension getPatchExtension() {
+        return patchExtension
     }
 
 }

src/main/groovy/org/cadixdev/gradle/gitpatcher/GitPatcher.groovy

@@ -24,10 +24,12 @@ package org.cadixdev.gradle.gitpatcher.task
 
 import org.cadixdev.gradle.gitpatcher.Git
 import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
 class FindGitTask extends DefaultTask {
 
+    @Internal
     String submodule
 
     @TaskAction

src/main/groovy/org/cadixdev/gradle/gitpatcher/task/FindGitTask.groovy

@@ -23,9 +23,11 @@
 package org.cadixdev.gradle.gitpatcher.task
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Internal
 
 abstract class GitTask extends DefaultTask {
 
+    @Internal
     File repo
 
 }

src/main/groovy/org/cadixdev/gradle/gitpatcher/task/GitTask.groovy

@@ -22,8 +22,11 @@
 
 package org.cadixdev.gradle.gitpatcher.task
 
+import org.gradle.api.tasks.Internal
+
 abstract class SubmoduleTask extends GitTask {
 
+    @Internal
     String submodule
 
     {

src/main/groovy/org/cadixdev/gradle/gitpatcher/task/SubmoduleTask.groovy

@@ -22,11 +22,12 @@
 
 package org.cadixdev.gradle.gitpatcher.task
 
-import static java.lang.System.out
-
 import org.cadixdev.gradle.gitpatcher.Git
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 
+import static java.lang.System.out
+
 class UpdateSubmodulesTask extends SubmoduleTask {
 
     private String ref
@@ -46,6 +47,7 @@ class UpdateSubmodulesTask extends SubmoduleTask {
         git.submodule('update', '--init', '--recursive') >> out
     }
 
+    @Internal
     String getRef() {
         ref
     }

src/main/groovy/org/cadixdev/gradle/gitpatcher/task/UpdateSubmodulesTask.groovy

@@ -22,17 +22,15 @@
 
 package org.cadixdev.gradle.gitpatcher.task.patch
 
-import static java.lang.System.out
-
 import org.cadixdev.gradle.gitpatcher.Git
 import org.cadixdev.gradle.gitpatcher.task.UpdateSubmodulesTask
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.*
+
+import static java.lang.System.out
 
 class ApplyPatchesTask extends PatchTask {
 
+    @Internal
     UpdateSubmodulesTask updateTask
 
     @Override @InputFiles

src/main/groovy/org/cadixdev/gradle/gitpatcher/task/patch/ApplyPatchesTask.groovy

@@ -23,13 +23,17 @@
 package org.cadixdev.gradle.gitpatcher.task.patch
 
 import org.cadixdev.gradle.gitpatcher.task.SubmoduleTask
+import org.gradle.api.tasks.Internal
 
 abstract class PatchTask extends SubmoduleTask {
 
+    @Internal
     File root
 
+    @Internal
     File patchDir
 
+    @Internal
     protected File[] getPatches() {
         if (!patchDir.directory) {
             return []
@@ -38,10 +42,12 @@ abstract class PatchTask extends SubmoduleTask {
         return patchDir.listFiles({ dir, name -> name.endsWith('.patch') } as FilenameFilter).sort()
     }
 
+    @Internal
     File getSubmoduleRoot() {
         return new File(root, submodule)
     }
 
+    @Internal
     File getGitDir() {
         return new File(repo, '.git')
     }
@@ -66,11 +72,13 @@ abstract class PatchTask extends SubmoduleTask {
         }
     }
 
+    @Internal
     String getCachedRef() {
         readCache()
         return cachedRefs[0]
     }
 
+    @Internal
     String getCachedSubmoduleRef() {
         readCache()
         return cachedRefs[1]