diff options
| author | Mark Perry <maperry78@yahoo.com.au> | 2015-09-03 21:47:01 +1000 |
|---|---|---|
| committer | Mark Perry <maperry78@yahoo.com.au> | 2015-09-03 21:47:01 +1000 |
| commit | 03c9d23f0d3507dbab5f207fd4a20f4af258a434 (patch) | |
| tree | 85f1f7996e5b17f316da508377e19d9d487f57f9 | |
| parent | 52ade40191db0f47260d2875a073f68e2277474f (diff) | |
| parent | 0fd74d0e77c44bb895e97319d1d8faaacc8a5448 (diff) | |
| download | frege-gradle-plugin-03c9d23f0d3507dbab5f207fd4a20f4af258a434.tar.gz frege-gradle-plugin-03c9d23f0d3507dbab5f207fd4a20f4af258a434.tar.bz2 frege-gradle-plugin-03c9d23f0d3507dbab5f207fd4a20f4af258a434.zip | |
Merge branch 'master' of https://github.com/Frege/frege-gradle-plugin
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 49875 -> 53636 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | src/main/groovy/frege/gradle/FregeTask.groovy | 8 |
4 files changed, 12 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index 6e3ba93..38b30a1 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,8 @@ ext { snapshotAppendix = "-SNAPSHOT" projectVersion = baseVersion + (isSnapshot ? snapshotAppendix : "") - fregeBaseVersion = "3.22.367" - fregeClassifier = "-g2737683" + fregeBaseVersion = "3.22.524" + fregeClassifier = "-gcc99d7e" fregeVersion = "$fregeBaseVersion$fregeClassifier" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex a7634b0..fd7e590 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2bd698e..330b106 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Feb 05 21:33:10 EST 2015 +#Sun Aug 30 17:39:41 CEST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip diff --git a/src/main/groovy/frege/gradle/FregeTask.groovy b/src/main/groovy/frege/gradle/FregeTask.groovy index fc3152d..a85b4cc 100644 --- a/src/main/groovy/frege/gradle/FregeTask.groovy +++ b/src/main/groovy/frege/gradle/FregeTask.groovy @@ -13,6 +13,9 @@ class FregeTask extends DefaultTask { static String DEFAULT_SRC_DIR = "src/main/frege" // TODO: should this come from a source set? @Optional @Input + String xss = "4m" + + @Optional @Input boolean hints = false @Optional @Input @@ -56,6 +59,11 @@ class FregeTask extends DefaultTask { action.setMain("frege.compiler.Main") action.setClasspath(project.files(project.configurations.compile)) + List jvmargs = [] + if (xss) + jvmargs << "-Xss$xss" + action.setJvmArgs(jvmargs) + def args = allArgs ? allArgs.split().toList() : assembleArguments() logger.info("Calling Frege compiler with args: '$args'") |