Merge pull request #79 from ngyukman/master

Removing timeout arg in NugetPush

.gitignore

@@ -4,4 +4,8 @@
 /bin
 /.idea
 *.iml
-out
+out
+.classpath
+.project
+**/bin/Debug
+**/obj/Debug

CHANGELOG.md

@@ -1,5 +1,15 @@
 # gradle-nuget-plugin changelog
 
+## 2.19
+### Changed
+* Add Input and Output Annotations for Gradle 7 [#77](https://github.com/Itiviti/gradle-nuget-plugin/issues/77)
+* Built with gradle 6.2.2
+* Default NuGet version used is 5.5.0
+
+### Removed
+* Due to conflict in Gradle 6.1, `timeout` in `nugetPush` is removed [#78](https://github.com/Itiviti/gradle-nuget-plugin/issues/78)
+* Usage of deprecated base.getDistsDir [#76](https://github.com/Itiviti/gradle-nuget-plugin/issues/76)
+
 ## 2.18
 ### Changed
 * built with gradle 4.7 (above won't work till we migrate out of plugindev)

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'nu.studer.plugindev' version '1.0.3'
-    id "com.jfrog.bintray" version "1.8.0"
+    id 'nu.studer.plugindev' version '1.0.12'
+    id 'com.jfrog.bintray' version '1.8.0'
     id 'net.researchgate.release' version '2.6.0'
 }
 
@@ -11,18 +11,12 @@ apply plugin: 'groovy'
 description 'Gradle plugin for NuGet, to package, upload artifacts and restore packages.'
 
 dependencies {
-    compile 'commons-io:commons-io:2.5'
-    testCompile 'junit:junit:4.12'
-    testCompile 'xmlunit:xmlunit:1.6'
-    testCompile ('org.spockframework:spock-core:1.1-groovy-2.4') {
-        exclude module: 'groovy-all'
-    }
+    implementation 'commons-io:commons-io:2.5'
+    testImplementation 'xmlunit:xmlunit:1.6'
+    testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
 }
 
 bintray {
-    // to remove when upgraded plugindev to 1.0.4
-    user project.properties.bintrayUser
-    key project.properties.bintrayApiKey
     pkg.repo = 'gradle-plugins'
     pkg.version.gpg.sign = true
     pkg.userOrg = 'ullink'
@@ -43,4 +37,4 @@ plugindev {
     done()
 }
 
-project.tasks.afterReleaseBuild.dependsOn project.tasks.bintrayUpload
+project.tasks.afterReleaseBuild.dependsOn project.tasks.bintrayUpload

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-4.7-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

@@ -1,19 +1,24 @@
 package com.ullink
 
 import org.gradle.api.tasks.Exec
-
+import org.gradle.api.tasks.Console
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.Input
 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
     String verbosity
 
+    @Optional
+    @Input
     String nugetExePath
 
-    public BaseNuGet() {
+    BaseNuGet() {
     }
 
     private File getNugetHome() {

src/main/groovy/com/ullink/NuGetExtension.groovy

@@ -1,5 +1,5 @@
 package com.ullink
 
 class NuGetExtension {
-    String version = '4.9.4'
+    String version = '5.5.0'
 }

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

@@ -1,23 +1,59 @@
 package com.ullink
 
-class NuGetInstall extends BaseNuGet {
+import org.gradle.api.tasks.*;
 
-    def packageId
-    def packagesConfigFile
+class NuGetInstall extends BaseNuGet {
 
+    @Optional
+    @Input
+    String packageId
+    @Optional
+    @InputFile
+    File packagesConfigFile
+    @Input
     def sources = [] as Set
-    def outputDirectory
+    @Optional
+    @OutputDirectory
+    File outputDirectory
+    @Optional
+    @Input
     def version
+    @Input
     def includeVersionInPath = true
+    @Input
     def prerelease = false
+    @Input
     def noCache = false
+    @Input
     def requireConsent = false
-    def solutionDirectory
+    @Optional
+    @InputDirectory
+    File solutionDirectory
+    @Optional
+    @Input
     def conflictAction
-    def configFile
+    @Optional
+    @Input
+    File configFile
 
     NuGetInstall() {
-		super('install')
+        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