cleanup build.gradle, make regex usage compliant to Frege 3.23

Dierk · Feb 28, 2016 · 301e9c5 · 301e9c5
1 parent d37a7f1
commit 301e9c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,9 +5,6 @@ buildscript {        // make the frege plugin available in our build
         maven {
             url = "https://oss.sonatype.org/content/groups/public"
         }
-//        maven {
-//            url = "https://jitpack.io"
-//        }
     }
     dependencies {
         classpath 'org.frege-lang:frege-gradle-plugin:0.4.2-SNAPSHOT', {
@@ -17,11 +14,11 @@ buildscript {        // make the frege plugin available in our build
     }
 }
 
-apply plugin: 'java'
 apply plugin: 'frege'
-apply plugin: "application"
 
-mainClassName = 'org.frege.Application'
+frege {
+    mainModule = 'org.frege.Application'
+}
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -40,9 +37,8 @@ repositories {
 }
 
 dependencies {
-//        compile "org.frege-lang:frege:3.22.524-gcc99d7e"
+    frege   "org.frege-lang:frege:3.23.288-gaa3af0c"
     compile "org.frege-lang:fregefx:0.2.0-SNAPSHOT"
-    compile "org.frege-lang:frege-repl-core:1.2.1-SNAPSHOT" // , { exclude module:"frege" }
+    compile "org.frege-lang:frege-repl-core:1.2.1-SNAPSHOT"
 }
 
-project.tasks.compileFrege.dependsOn(project.tasks.compileJava) // make java compile first
diff --git a/src/main/frege/org/frege/Application.fr b/src/main/frege/org/frege/Application.fr
@@ -211,7 +211,7 @@ myJavaSourceGUI javaSource = monolog "Java Source" ("<html>"++ style ++"<code><p
 
 myHelpGUI :: String -> String -> IO ()
 myHelpGUI title content = monolog title rel2absolute where
-    rel2absolute = (´href="\.\/´.matcher content).replaceAll "href=\"http://www.frege-lang.org/doc/"
+    rel2absolute = content.replaceAll ´href="\.\/´  "href=\"http://www.frege-lang.org/doc/"
 
 monolog :: String -> String -> IO ()
 monolog title content =