diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 7a994f1..d970b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'maven'
-apply plugin: 'findbugs'
sourceSets {
main.java.srcDirs += 'src'
@@ -18,7 +17,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.4'
+ ext.kotlin_version = '1.0.5-2'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
@@ -48,10 +47,6 @@
}
}
-findbugs {
- ignoreFailures = true
-}
-
javadoc {
failOnError = false
}
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 7a994f1..d970b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'maven'
-apply plugin: 'findbugs'
sourceSets {
main.java.srcDirs += 'src'
@@ -18,7 +17,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.4'
+ ext.kotlin_version = '1.0.5-2'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
@@ -48,10 +47,6 @@
}
}
-findbugs {
- ignoreFailures = true
-}
-
javadoc {
failOnError = false
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 30d399d..51288f9 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 7a994f1..d970b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'maven'
-apply plugin: 'findbugs'
sourceSets {
main.java.srcDirs += 'src'
@@ -18,7 +17,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.4'
+ ext.kotlin_version = '1.0.5-2'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
@@ -48,10 +47,6 @@
}
}
-findbugs {
- ignoreFailures = true
-}
-
javadoc {
failOnError = false
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 30d399d..51288f9 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 597a17d..936948a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 20 21:33:25 CEST 2015
+#Sun Dec 11 20:20:29 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 7a994f1..d970b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'maven'
-apply plugin: 'findbugs'
sourceSets {
main.java.srcDirs += 'src'
@@ -18,7 +17,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.4'
+ ext.kotlin_version = '1.0.5-2'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
@@ -48,10 +47,6 @@
}
}
-findbugs {
- ignoreFailures = true
-}
-
javadoc {
failOnError = false
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 30d399d..51288f9 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 597a17d..936948a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 20 21:33:25 CEST 2015
+#Sun Dec 11 20:20:29 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -6,12 +6,30 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -30,6 +48,7 @@
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,31 +59,11 @@
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 7a994f1..d970b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'maven'
-apply plugin: 'findbugs'
sourceSets {
main.java.srcDirs += 'src'
@@ -18,7 +17,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.4'
+ ext.kotlin_version = '1.0.5-2'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
@@ -48,10 +47,6 @@
}
}
-findbugs {
- ignoreFailures = true
-}
-
javadoc {
failOnError = false
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 30d399d..51288f9 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 597a17d..936948a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 20 21:33:25 CEST 2015
+#Sun Dec 11 20:20:29 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -6,12 +6,30 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -30,6 +48,7 @@
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,31 +59,11 @@
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..f955316 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@
goto fail
:init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 7a994f1..d970b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'maven'
-apply plugin: 'findbugs'
sourceSets {
main.java.srcDirs += 'src'
@@ -18,7 +17,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.4'
+ ext.kotlin_version = '1.0.5-2'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
@@ -48,10 +47,6 @@
}
}
-findbugs {
- ignoreFailures = true
-}
-
javadoc {
failOnError = false
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 30d399d..51288f9 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 597a17d..936948a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 20 21:33:25 CEST 2015
+#Sun Dec 11 20:20:29 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -6,12 +6,30 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -30,6 +48,7 @@
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,31 +59,11 @@
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..f955316 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@
goto fail
:init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
diff --git a/settings.gradle b/settings.gradle
index cbaccac..eb208bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
rootProject.name = 'k2html'
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 7a994f1..d970b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'maven'
-apply plugin: 'findbugs'
sourceSets {
main.java.srcDirs += 'src'
@@ -18,7 +17,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.4'
+ ext.kotlin_version = '1.0.5-2'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
@@ -48,10 +47,6 @@
}
}
-findbugs {
- ignoreFailures = true
-}
-
javadoc {
failOnError = false
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 30d399d..51288f9 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 597a17d..936948a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 20 21:33:25 CEST 2015
+#Sun Dec 11 20:20:29 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -6,12 +6,30 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -30,6 +48,7 @@
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,31 +59,11 @@
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..f955316 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@
goto fail
:init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
diff --git a/settings.gradle b/settings.gradle
index cbaccac..eb208bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
rootProject.name = 'k2html'
-
diff --git a/src/nl/astraeus/tag/TagCreator.kt b/src/nl/astraeus/tag/TagCreator.kt
index ddd36a0..66816b4 100644
--- a/src/nl/astraeus/tag/TagCreator.kt
+++ b/src/nl/astraeus/tag/TagCreator.kt
@@ -191,7 +191,7 @@
}
fun indent(indent: Int): String {
- var result = StringBuilder()
+ val result = StringBuilder()
for(i in 1..indent) {
result.append(" ")
@@ -201,7 +201,7 @@
}
open fun render(indent: Int = 0, pretty: Boolean = false): String {
- var result = StringBuilder()
+ val result = StringBuilder()
if (pretty) {
result.append(indent(indent))
@@ -358,7 +358,7 @@
if (this === child) {
throw Error("Cannot append a tag to itself.")
}
- var result = copy()
+ val result = copy()
child.parent = this
result.children.add(child)
@@ -371,7 +371,7 @@
}
fun copy(): ContainerTag {
- var result = ContainerTag(tag)
+ val result = ContainerTag(tag)
result.children = ArrayList(children)
return result;
}
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a5c3ae1..a28fa13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,11 @@
+
+
+
+
+
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
deleted file mode 100644
index 859324a..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
new file mode 100644
index 0000000..3590fad
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
deleted file mode 100644
index 3207038..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
new file mode 100644
index 0000000..7b0f401
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_6_eap_77.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html.iml b/.idea/modules/k2html.iml
index b49dabe..2e6570d 100644
--- a/.idea/modules/k2html.iml
+++ b/.idea/modules/k2html.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/k2html_main.iml b/.idea/modules/k2html_main.iml
index 4606a46..8108a0b 100644
--- a/.idea/modules/k2html_main.iml
+++ b/.idea/modules/k2html_main.iml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/.idea/modules/k2html_test.iml b/.idea/modules/k2html_test.iml
index d9a9466..5957e52 100644
--- a/.idea/modules/k2html_test.iml
+++ b/.idea/modules/k2html_test.iml
@@ -1,5 +1,5 @@
-
+
@@ -14,9 +14,9 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 7a994f1..d970b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'maven'
-apply plugin: 'findbugs'
sourceSets {
main.java.srcDirs += 'src'
@@ -18,7 +17,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.4'
+ ext.kotlin_version = '1.0.5-2'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
@@ -48,10 +47,6 @@
}
}
-findbugs {
- ignoreFailures = true
-}
-
javadoc {
failOnError = false
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 30d399d..51288f9 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 597a17d..936948a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 20 21:33:25 CEST 2015
+#Sun Dec 11 20:20:29 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..4453cce 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -6,12 +6,30 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -30,6 +48,7 @@
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,31 +59,11 @@
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..f955316 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@
goto fail
:init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
diff --git a/settings.gradle b/settings.gradle
index cbaccac..eb208bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
rootProject.name = 'k2html'
-
diff --git a/src/nl/astraeus/tag/TagCreator.kt b/src/nl/astraeus/tag/TagCreator.kt
index ddd36a0..66816b4 100644
--- a/src/nl/astraeus/tag/TagCreator.kt
+++ b/src/nl/astraeus/tag/TagCreator.kt
@@ -191,7 +191,7 @@
}
fun indent(indent: Int): String {
- var result = StringBuilder()
+ val result = StringBuilder()
for(i in 1..indent) {
result.append(" ")
@@ -201,7 +201,7 @@
}
open fun render(indent: Int = 0, pretty: Boolean = false): String {
- var result = StringBuilder()
+ val result = StringBuilder()
if (pretty) {
result.append(indent(indent))
@@ -358,7 +358,7 @@
if (this === child) {
throw Error("Cannot append a tag to itself.")
}
- var result = copy()
+ val result = copy()
child.parent = this
result.children.add(child)
@@ -371,7 +371,7 @@
}
fun copy(): ContainerTag {
- var result = ContainerTag(tag)
+ val result = ContainerTag(tag)
result.children = ArrayList(children)
return result;
}
diff --git a/test/nl/astraeus/tag/BasicTest.kt b/test/nl/astraeus/tag/BasicTest.kt
index 0d48d31..5fd4b19 100644
--- a/test/nl/astraeus/tag/BasicTest.kt
+++ b/test/nl/astraeus/tag/BasicTest.kt
@@ -70,11 +70,11 @@
""")
- var head = head()
+ val head = head()
head.with(style().withType("text/css").withSrc("/res/css/bs.css"))
- var html = html().with(head).with(body().with(form))
+ val html = html().with(head).with(body().with(form))
println(html.render(pretty = true))
}