Resolve release types to strings before checking the validity. Fixes #6

matthewprenger · Jul 23, 2016 · c7181bb · c7181bb
1 parent 11994f5
commit c7181bb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Nov 22 21:23:57 CST 2015
+#Sat Jul 23 13:53:39 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
diff --git a/src/main/groovy/com/matthewprenger/cursegradle/CurseArtifact.groovy b/src/main/groovy/com/matthewprenger/cursegradle/CurseArtifact.groovy
@@ -75,6 +75,7 @@ class CurseArtifact implements Serializable {
  check(changelogType != null, "The changelogType was null for project $id")
  check(changelog != null, "The changelog was not set for project $id")
  check(releaseType != null, "The releaseType was not set for project $id")
+ releaseType = Util.resolveString(releaseType)
  check(CurseGradlePlugin.VALID_RELEASE_TYPES.contains(releaseType), "Invalid release type ($releaseType) for project $id. Valid options are: $CurseGradlePlugin.VALID_RELEASE_TYPES")
  curseRelations.each { it.validate(id) }
  }

diff --git a/src/main/groovy/com/matthewprenger/cursegradle/Util.groovy b/src/main/groovy/com/matthewprenger/cursegradle/Util.groovy
@@ -49,6 +49,11 @@ class Util {
  */
  static String resolveString(Object obj) {
  checkNotNull(obj)
+
+ while(obj instanceof Closure) {
+ obj = ((Closure)obj).call()
+ }
+
  if (obj instanceof String) {
  return (String) obj
  }