Add Input/Output annotation to task properties

it will be mandatory in Gradle 7

Change-Id: I5accc3f4b555834f129953831d304f23555a7406

CHANGELOG.md

@@ -1,5 +1,12 @@
 # gradle-nuget-plugin changelog
 
+## 2.19
+### Changed
+* Add Input and Output Annotations for Gradle 7
+
+### Removed
+* Due to conflict in Gradle 6.1, `timeout` in `nugetPush` is removed
+
 ## 2.18
 ### Changed
 * built with gradle 4.7 (above won't work till we migrate out of plugindev)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Dec 31 11:18:19 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
  GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
  APP_HOME=`cygpath --path --mixed "$APP_HOME"`
  CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
  JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
  else
  eval `echo args$i`="\"$arg\""
  fi
- i=$((i+1))
+ i=`expr $i + 1`
  done
  case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
  esac
 fi
 
@@ -159,14 +175,9 @@ save () {
  for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
  echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/main/groovy/com/ullink/BaseNuGet.groovy

@@ -7,7 +7,7 @@ import java.nio.file.Paths
 
 import static org.apache.tools.ant.taskdefs.condition.Os.*
 
-public class BaseNuGet extends Exec {
+class BaseNuGet extends Exec {
  private static final String NUGET_EXE = 'NuGet.exe'
 
  @Console
@@ -16,7 +16,7 @@ public class BaseNuGet extends Exec {
  @Input
  String nugetExePath
 
- public BaseNuGet() {
+ BaseNuGet() {
  }
 
  private File getNugetHome() {

src/main/groovy/com/ullink/NuGetInstall.groovy

@@ -4,14 +4,17 @@ import org.gradle.api.tasks.*;
 
 class NuGetInstall extends BaseNuGet {
 
+ @Optional
  @Input
- def packageId
+ String packageId
+ @Optional
  @InputFile
  File packagesConfigFile
  @Input
  def sources = [] as Set
  @OutputDirectory
  File outputDirectory
+ @Optional
  @Input
  def version
  @Input
@@ -22,17 +25,36 @@ class NuGetInstall extends BaseNuGet {
  def noCache = false
  @Input
  def requireConsent = false
+ @Optional
  @InputDirectory
  File solutionDirectory
+ @Optional
  @Input
  def conflictAction
+ @Optional
  @Input
- def configFile
+ File configFile
 
  NuGetInstall() {
  super('install')
  }
 
+ void setPackagesConfigFile(String path) {
+ packagesConfigFile = project.file(path)
+ }
+
+ void setOutputDirectory(String path) {
+ outputDirectory = project.file(path)
+ }
+
+ void setSolutionDirectory(String path) {
+ solutionDirectory = project.file(path)
+ }
+
+ void setConfigFile(String path) {
+ configFile = project.file(path)
+ }
+
  @Override
  void exec() {
  if (packageId) args packageId

src/main/groovy/com/ullink/NuGetPack.groovy

@@ -9,16 +9,16 @@ import org.gradle.api.tasks.*
 class NuGetPack extends BaseNuGet {
 
  @Optional
- @Input
- def nuspecFile
+ @InputFile
+ File nuspecFile
  @Optional
- @Input
- def csprojPath
+ @InputFile
+ File csprojPath
 
  @OutputDirectory
  def destinationDir = project.convention.plugins.base.distsDir
- @Input
- def basePath
+ @InputFile
+ File basePath
  @Input
  def packageVersion
  @Optional
@@ -62,6 +62,18 @@ class NuGetPack extends BaseNuGet {
  }
  }
 
+ void setDestinationDir(String path) {
+ destinationDir = project.file(path)
+ }
+
+ void setNuspecFile(String path) {
+ nuspecFile = project.file(path)
+ }
+
+ void setCsprojPath(String path) {
+ csprojPath = project.file(path)
+ }
+
  @Override
  void exec() {
  args getNuspecOrCsproj()
@@ -109,16 +121,12 @@ class NuGetPack extends BaseNuGet {
  }
 
  NuGetSpec getDependentNuGetSpec() {
- dependsOn.find { it instanceof NuGetSpec }
+ dependsOn.find { it instanceof NuGetSpec } as NuGetSpec
  }
 
  // Because Nuget pack handle csproj or nuspec file we should be able to use it in plugin
- @InputFile
  File getNuspecOrCsproj() {
- if (csprojPath) {
- return project.file(csprojPath)
- }
- getNuspecFile()
+ csprojPath ? csprojPath : getNuspecFile()
  }
 
  GPathResult getNuspec() {
@@ -136,7 +144,7 @@ class NuGetPack extends BaseNuGet {
 
  File getNuspecFile() {
  if (nuspecFile) {
- return project.file(this.nuspecFile)
+ return nuspecFile
  }
  if (dependentNuGetSpec) {
  return dependentNuGetSpec.nuspecFile

src/main/groovy/com/ullink/NuGetPush.groovy

@@ -1,23 +1,47 @@
 package com.ullink
 
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+
 class NuGetPush extends BaseNuGet {
 
- def nupkgFile
+ @Optional
+ @InputFile
+ File nupkgFile
+ @Optional
+ @Input
  def serverUrl
+ @Optional
+ @InputFile
  def apiKey
+ @Optional
+ @InputFile
  def configFile
 
  NuGetPush() {
  super('push')
  }
 
+ void setNupkgFile(String path) {
+ nupkgFile = project.file(path)
+ }
+
+ void setApiKey(String path) {
+ apiKey = project.file(path)
+ }
+
+ void setConfigFile(String path) {
+ configFile = project.file(path)
+ }
+
  String getNugetPackOutputFile() {
  if (dependentNuGetPack)
  dependentNuGetPack.packageFile
  }
 
  NuGetPack getDependentNuGetPack() {
- dependsOn.find { it instanceof NuGetPack }
+ dependsOn.find { it instanceof NuGetPack } as NuGetPack
  }
 
  @Override