diff --git a/.travis.yml b/.travis.yml
index 0e20a18..d1d8e86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,12 @@ jdk:
install:
- wget --quiet --output-document=/tmp/ceylon.zip $CEYLON
- unzip /tmp/ceylon.zip
- - export PATH=$PATH:$PWD/ceylon-1.3.0/bin/
+ - export PATH=$PATH:$PWD/ceylon-1.3.1/bin/
before_script:
- ceylon compile
script:
- ceylon test $TEST_MODULE
env:
global:
- - CEYLON="http://ceylon-lang.org/download/dist/1_3_0"
+ - CEYLON="http://ceylon-lang.org/download/dist/1_3_1"
- TEST_MODULE="test.com.github.bjansen.gyokuro.core"
diff --git a/demos/gyokuro/demo/gson/module.ceylon b/demos/gyokuro/demo/gson/module.ceylon
index 49a6edc..4d3326e 100644
--- a/demos/gyokuro/demo/gson/module.ceylon
+++ b/demos/gyokuro/demo/gson/module.ceylon
@@ -2,5 +2,5 @@ native("jvm")
module gyokuro.demo.gson "0.2-dev" {
import com.github.bjansen.gyokuro.core "0.2-dev";
import com.github.bjansen.gyokuro.transform.gson "0.2-dev";
- import ceylon.logging "1.3.0";
+ import ceylon.logging "1.3.1";
}
diff --git a/demos/gyokuro/demo/rest/module.ceylon b/demos/gyokuro/demo/rest/module.ceylon
index 5cbd02f..deda10d 100644
--- a/demos/gyokuro/demo/rest/module.ceylon
+++ b/demos/gyokuro/demo/rest/module.ceylon
@@ -1,5 +1,5 @@
native("jvm")
module gyokuro.demo.rest "1.0.0" {
import com.github.bjansen.gyokuro.core "0.2-dev";
- import ceylon.logging "1.3.0";
+ import ceylon.logging "1.3.1";
}
diff --git a/demos/gyokuro/demo/thymeleaf/module.ceylon b/demos/gyokuro/demo/thymeleaf/module.ceylon
index 4600091..503714d 100644
--- a/demos/gyokuro/demo/thymeleaf/module.ceylon
+++ b/demos/gyokuro/demo/thymeleaf/module.ceylon
@@ -2,5 +2,5 @@ native("jvm")
module gyokuro.demo.thymeleaf "0.2-dev" {
import com.github.bjansen.gyokuro.core "0.2-dev";
import com.github.bjansen.gyokuro.view.thymeleaf "0.2-dev";
- import ceylon.logging "1.3.0";
+ import ceylon.logging "1.3.1";
}
diff --git a/gyokuro.iml b/gyokuro.iml
index 0f31bb9..c7a079f 100644
--- a/gyokuro.iml
+++ b/gyokuro.iml
@@ -19,28 +19,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/source/com/github/bjansen/gyokuro/core/internal/converters.ceylon b/source/com/github/bjansen/gyokuro/core/internal/converters.ceylon
index a677d41..e2fb758 100644
--- a/source/com/github/bjansen/gyokuro/core/internal/converters.ceylon
+++ b/source/com/github/bjansen/gyokuro/core/internal/converters.ceylon
@@ -29,16 +29,16 @@ object primitiveTypesConverter satisfies Converter<> {
shared actual Anything convert(OpenType type, String str) {
if (type == `class Integer`.openType) {
- return parseInteger(str);
+ return Integer.parse(str);
} else if (type == `class String`.openType) {
return str;
} else if (type == `class Float`.openType) {
- return parseFloat(str);
+ return Float.parse(str);
} else if (type == `class Boolean`.openType) {
if (str == "0") { return false; }
if (str == "1") { return true; }
- return parseBoolean(str);
+ return Boolean.parse(str);
}
return null;
diff --git a/source/com/github/bjansen/gyokuro/core/mimeparse.ceylon b/source/com/github/bjansen/gyokuro/core/mimeparse.ceylon
index 290fca5..6408dad 100644
--- a/source/com/github/bjansen/gyokuro/core/mimeparse.ceylon
+++ b/source/com/github/bjansen/gyokuro/core/mimeparse.ceylon
@@ -56,7 +56,9 @@ shared object mimeParse {
if (fitness > bestFitness) {
bestFitness = fitness;
- bestFitQ = parseFloat(range[2].get("q") else "0") else 0.0;
+ bestFitQ = if (is Float f = Float.parse(range[2].get("q") else "0"))
+ then f
+ else 0.0;
}
}
}
@@ -82,8 +84,11 @@ shared object mimeParse {
ParseResults parseMediaRange(String header) {
value results = parseMimeType(header);
value q = results[2].get("q") else "1.0";
- value f = let(_f = parseFloat(q) else 1.0)
- if (_f < 0.0 || _f > 1.0) then 1.0 else _f;
+ value f = if (is Float _f = Float.parse(q))
+ then if (_f < 0.0 || _f > 1.0)
+ then 1.0
+ else _f
+ else 1.0;
assert(is MutableMap m = results[2]);
m.put("q", f.string);
diff --git a/source/com/github/bjansen/gyokuro/core/module.ceylon b/source/com/github/bjansen/gyokuro/core/module.ceylon
index c8c4296..5611e07 100644
--- a/source/com/github/bjansen/gyokuro/core/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/core/module.ceylon
@@ -6,12 +6,12 @@ module com.github.bjansen.gyokuro.core "0.2-dev" {
shared import com.github.bjansen.gyokuro.view.api "0.2-dev";
shared import com.github.bjansen.gyokuro.transform.api "0.2-dev";
- shared import ceylon.http.server "1.3.0";
- shared import ceylon.json "1.3.0";
+ shared import ceylon.http.server "1.3.1";
+ shared import ceylon.json "1.3.1";
- import ceylon.logging "1.3.0";
- import ceylon.collection "1.3.0";
- import ceylon.io "1.3.0";
+ import ceylon.logging "1.3.1";
+ import ceylon.collection "1.3.1";
+ import ceylon.io "1.3.1";
import java.base "7";
}
diff --git a/source/com/github/bjansen/gyokuro/report/module.ceylon b/source/com/github/bjansen/gyokuro/report/module.ceylon
index 19257cf..8e3c3f9 100644
--- a/source/com/github/bjansen/gyokuro/report/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/report/module.ceylon
@@ -1,7 +1,7 @@
native("jvm")
module com.github.bjansen.gyokuro.report "0.2-dev" {
- shared import ceylon.file "1.3.0";
+ shared import ceylon.file "1.3.1";
- import ceylon.html "1.3.0";
+ import ceylon.html "1.3.1";
import com.github.bjansen.gyokuro.core "0.2-dev";
}
diff --git a/source/com/github/bjansen/gyokuro/transform/api/module.ceylon b/source/com/github/bjansen/gyokuro/transform/api/module.ceylon
index 9dd2fce..900cffa 100644
--- a/source/com/github/bjansen/gyokuro/transform/api/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/transform/api/module.ceylon
@@ -1,4 +1,4 @@
native("jvm")
module com.github.bjansen.gyokuro.transform.api "0.2-dev" {
- import ceylon.interop.java "1.3.0";
+ import ceylon.interop.java "1.3.1";
}
diff --git a/source/com/github/bjansen/gyokuro/transform/gson/module.ceylon b/source/com/github/bjansen/gyokuro/transform/gson/module.ceylon
index 5f41fcc..82c9eed 100644
--- a/source/com/github/bjansen/gyokuro/transform/gson/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/transform/gson/module.ceylon
@@ -3,5 +3,5 @@ module com.github.bjansen.gyokuro.transform.gson "0.2-dev" {
shared import com.github.bjansen.gyokuro.transform.api "0.2-dev";
shared import maven:"com.google.code.gson:gson" "2.5";
- import ceylon.interop.java "1.3.0";
+ import ceylon.interop.java "1.3.1";
}
diff --git a/source/com/github/bjansen/gyokuro/view/api/module.ceylon b/source/com/github/bjansen/gyokuro/view/api/module.ceylon
index 592748b..7213a2e 100644
--- a/source/com/github/bjansen/gyokuro/view/api/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/view/api/module.ceylon
@@ -2,6 +2,6 @@
a template engine."
native("jvm")
module com.github.bjansen.gyokuro.view.api "0.2-dev" {
- shared import ceylon.http.server "1.3.0";
- shared import ceylon.interop.java "1.3.0";
+ shared import ceylon.http.server "1.3.1";
+ shared import ceylon.interop.java "1.3.1";
}
diff --git a/source/com/github/bjansen/gyokuro/view/ceylonhtml/module.ceylon b/source/com/github/bjansen/gyokuro/view/ceylonhtml/module.ceylon
index f63e488..0b02833 100644
--- a/source/com/github/bjansen/gyokuro/view/ceylonhtml/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/view/ceylonhtml/module.ceylon
@@ -2,5 +2,5 @@ native("jvm")
module com.github.bjansen.gyokuro.view.ceylonhtml "0.2-dev" {
shared import com.github.bjansen.gyokuro.view.api "0.2-dev";
shared import com.github.bjansen.gyokuro.core "0.2-dev";
- shared import ceylon.html "1.3.0";
+ shared import ceylon.html "1.3.1";
}
diff --git a/source/com/github/bjansen/gyokuro/view/mustache/module.ceylon b/source/com/github/bjansen/gyokuro/view/mustache/module.ceylon
index c8aae04..b16312b 100644
--- a/source/com/github/bjansen/gyokuro/view/mustache/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/view/mustache/module.ceylon
@@ -5,5 +5,5 @@ module com.github.bjansen.gyokuro.view.mustache "0.2-dev" {
shared import com.github.bjansen.gyokuro.view.api "0.2-dev";
shared import maven:"com.github.spullara.mustache.java:compiler" "0.8.18";
- import ceylon.interop.java "1.3.0";
+ import ceylon.interop.java "1.3.1";
}
diff --git a/source/com/github/bjansen/gyokuro/view/pebble/module.ceylon b/source/com/github/bjansen/gyokuro/view/pebble/module.ceylon
index 754856d..4eadad3 100644
--- a/source/com/github/bjansen/gyokuro/view/pebble/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/view/pebble/module.ceylon
@@ -5,5 +5,5 @@ module com.github.bjansen.gyokuro.view.pebble "0.2-dev" {
shared import com.github.bjansen.gyokuro.core "0.2-dev";
shared import maven:"com.mitchellbosecke:pebble" "2.2.0";
import java.base "7";
- import ceylon.interop.java "1.3.0";
+ import ceylon.interop.java "1.3.1";
}
diff --git a/source/com/github/bjansen/gyokuro/view/rythm/module.ceylon b/source/com/github/bjansen/gyokuro/view/rythm/module.ceylon
index 9381633..d52d1af 100644
--- a/source/com/github/bjansen/gyokuro/view/rythm/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/view/rythm/module.ceylon
@@ -6,5 +6,5 @@ module com.github.bjansen.gyokuro.view.rythm "0.2-dev" {
shared import maven:"org.rythmengine:rythm-engine" "1.0.1";
import java.base "7";
- import ceylon.interop.java "1.3.0";
+ import ceylon.interop.java "1.3.1";
}
diff --git a/source/com/github/bjansen/gyokuro/view/thymeleaf/module.ceylon b/source/com/github/bjansen/gyokuro/view/thymeleaf/module.ceylon
index c6763c8..ddebdc0 100644
--- a/source/com/github/bjansen/gyokuro/view/thymeleaf/module.ceylon
+++ b/source/com/github/bjansen/gyokuro/view/thymeleaf/module.ceylon
@@ -6,5 +6,5 @@ module com.github.bjansen.gyokuro.view.thymeleaf "0.2-dev" {
shared import maven:"org.thymeleaf:thymeleaf" "3.0.0.BETA01";
import java.base "7";
- import ceylon.interop.java "1.3.0";
+ import ceylon.interop.java "1.3.1";
}
diff --git a/test-source/test/com/github/bjansen/gyokuro/core/module.ceylon b/test-source/test/com/github/bjansen/gyokuro/core/module.ceylon
index 8defe28..1166bc4 100644
--- a/test-source/test/com/github/bjansen/gyokuro/core/module.ceylon
+++ b/test-source/test/com/github/bjansen/gyokuro/core/module.ceylon
@@ -1,9 +1,9 @@
native("jvm")
module test.com.github.bjansen.gyokuro.core "0.2-dev" {
import com.github.bjansen.gyokuro.core "0.2-dev";
- import ceylon.test "1.3.0";
- import ceylon.logging "1.3.0";
- import ceylon.html "1.3.0";
- import ceylon.http.client "1.3.0";
- import ceylon.uri "1.3.0";
+ import ceylon.test "1.3.1";
+ import ceylon.logging "1.3.1";
+ import ceylon.html "1.3.1";
+ import ceylon.http.client "1.3.1";
+ import ceylon.uri "1.3.1";
}