From 46ff61ea6ad5b29f3757efff2cb9f65a9af218ed Mon Sep 17 00:00:00 2001 From: Dierk Koenig Date: Mon, 24 Aug 2015 18:42:52 +0200 Subject: [PATCH] housework. Upgrading to Gradle 2.6. remove import warning --- allJavaFX.groovy | 19 -------- build.gradle | 58 ----------------------- gradle/wrapper/gradle-wrapper.jar | Bin 52141 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- src/main/frege/org/frege/Application.fr | 2 - 5 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 allJavaFX.groovy diff --git a/allJavaFX.groovy b/allJavaFX.groovy deleted file mode 100644 index d2cb12e..0000000 --- a/allJavaFX.groovy +++ /dev/null @@ -1,19 +0,0 @@ -def base = '/Users/dierkkoenig/Downloads/javafx-src/' -File sources = new File(base) - -sources.eachFileRecurse { File file -> - def name = file.path - base - if (! name.endsWith(".java")) return - if (! name.contains("javafx")) return - if (name.contains("com/sun")) return - - name -= ".java" - - def className = name.replaceAll(/\//, '.' ) - - println "processing $name" - - "gradlew -DnativeClassName=$className -DoutputFile=build/generated/frege/${name}.fr :preFregeFX:fNG".execute() - - sleep 3000 -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 001e504..0e02477 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ buildscript { // make the frege plugin available in our build } } - apply plugin: 'java' apply plugin: 'frege' apply plugin: "application" @@ -42,61 +41,4 @@ dependencies { compile "org.frege-lang:frege-repl-core:1.2.1-SNAPSHOT" // , { exclude module:"frege" } } - - - project.tasks.compileFrege.dependsOn(project.tasks.compileJava) // make java compile first - -ext { - jfxLibDir = locateJfxLibDir() -} - -//sourceSets { -// main { -// java { -// compileClasspath += project.files("build/classes/main") -// } -// } -//} - -dependencies { - compile files("$jfxLibDir/jfxrt.jar") // TODO: find out why this seems to be necessary even on JDK 8 -} - -// this should probably go into FregeFX or the Gradle plugin -String locateJfxLibDir() { - def javaFxHome = System.env['JAVAFX_HOME'] ?: '' - def javaHome = System.env['JAVA_HOME'] ?: '' - def jdk8 = System.getProperty('java.version')[0..2].toDouble() == 1.8 - - if (! jdk8) { - throw new GradleScriptException("Please use Java 8.", null) - } - - def jdkHome = System.properties.'java.home' ?: '' - - def result = "$javaFxHome/rt/lib" - if (new File("$result/jfxrt.jar").exists()) { - logger.info "using javafx from explicit JAVAFX_HOME: $result" - return result - } - result = "$jdkHome/lib/ext/" - if (jdk8 && new File("$result/jfxrt.jar").exists()) { - logger.info "using javafx from current java 8: $result" - return result - } - result = "$javaHome/jre/lib/" - if (new File("$result/jfxrt.jar").exists()) { - logger.info "using javafx from explicit JAVA_HOME: $result" - return result - } - result = "$javaHome/lib/" - if (new File("$result/jfxrt.jar").exists()) { - logger.info "using javafx from explicit JAVA_HOME: $result" - return result - } - logger.error "please use a Java Version 8" - logger.error " or set JAVA_HOME to a dir that contains the jre/lib/jfxrt.jar" - logger.error " or set JAVAFX_HOME to a dir that contains the rt/lib/jfxrt.jar" - throw new GradleScriptException("location of jfxrt.jar could not be determined", null) -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 085a1cdc27db1185342f15a00441734e74fe3735..fd7e590e5154e82211909581e71018372134fb27 100644 GIT binary patch delta 19230 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 delta 17740 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 614fcae..dadbb97 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Feb 21 19:40:12 CET 2015 +#Mon Aug 24 18:41:30 CEST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip diff --git a/src/main/frege/org/frege/Application.fr b/src/main/frege/org/frege/Application.fr index 00f7882..a83c2cf 100644 --- a/src/main/frege/org/frege/Application.fr +++ b/src/main/frege/org/frege/Application.fr @@ -224,8 +224,6 @@ monolog title content = stage.setScene scene stage.show -withUI f = Platform.runLater =<< Runnable.new f - data GraphicRepl = GraphicRepl {input :: (MVar String), inputArea :: IO (MVar TextArea), outputArea :: IO (MVar TextArea)} instance ReplIO GraphicRepl where