From 34a5b9cc9ca17e344810138e86c248703d469db1 Mon Sep 17 00:00:00 2001 From: Dierk Koenig Date: Sun, 23 Aug 2015 00:53:57 +0200 Subject: allow setting the stack size for the compiler with xss, default is 4m --- build.gradle | 4 ++-- src/main/groovy/frege/gradle/FregeTask.groovy | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index fcbcf78..1043f9c 100644 --- a/build.gradle +++ b/build.gradle @@ -24,8 +24,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/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 @@ -12,6 +12,9 @@ class FregeTask extends DefaultTask { static String DEFAULT_CLASSES_SUBDIR = "classes/main" // TODO: should this come from a convention? 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 @@ -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'") -- cgit From 0fd74d0e77c44bb895e97319d1d8faaacc8a5448 Mon Sep 17 00:00:00 2001 From: Dierk Koenig Date: Sun, 30 Aug 2015 18:02:40 +0200 Subject: upgrade to gradle 2.6 --- gradle/wrapper/gradle-wrapper.jar | Bin 49875 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a7634b0..fd7e590 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ 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 -- cgit