Sitelet https://github.com/KrailOrg/q3c-util/commit/45df6ccee2fb6e8c5ca97e02ca453911244d19f8
Skip to content

Commit 45df6cc

Browse files
author
David Sowerby
committed
Made MessageFormat2 Serializable. Updated Kotlin, and create Gradle wrapper
1 parent ef36d71 commit 45df6cc

6 files changed

Lines changed: 273 additions & 6 deletions

File tree

‎build.gradle‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.1.4-3'
2+
ext.kotlin_version = '1.2.31'
33
ext.kaytee_plugin_version = "0.18.10.0"
44

55
repositories {
@@ -16,12 +16,13 @@ buildscript {
1616

1717
apply plugin: 'kotlin'
1818
apply plugin: 'uk.q3c.kaytee'
19+
sourceCompatibility = '1.8'
1920

2021
group = 'uk.q3c.util'
2122

2223
kaytee {
2324
version {
24-
number = "0.13.1.3"
25+
number = "0.13.2.0"
2526
}
2627
}
2728

@@ -58,7 +59,7 @@ dependencies {
5859
compile 'net.sf.jung:jung-samples:2.0.1'
5960
compile 'com.google.code.findbugs:annotations:3.0.0'
6061
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
61-
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
62+
// compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
6263
compile 'com.google.guava:guava:' + guavaVersion
6364
compile 'org.apache.commons:commons-collections4:4.1'
6465

@@ -71,5 +72,8 @@ dependencies {
7172
testCompile 'cglib:cglib-nodep:3.2.0'
7273
testCompile 'org.objenesis:objenesis:2.2'
7374
}
74-
sourceCompatibility = '1.8'
75-
apply plugin: 'kotlin'
75+
76+
77+
task wrapper(type: Wrapper) {
78+
gradleVersion = '4.4.1'
79+
}

‎gradle/wrapper/gradle-wrapper.jar‎

53 KB
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Mon Mar 26 11:27:46 BST 2018
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

‎gradlew‎

Lines changed: 172 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 84 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/kotlin/uk/q3c/util/text/MessageFormat2.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package uk.q3c.util.text
22

33
import org.slf4j.helpers.MessageFormatter
4+
import java.io.Serializable
45

56
/**
67
* The native Java [java.text.MessageFormat] class exhibits some very strange behaviour when dealing with a single apostrophe. The Javadoc for it even includes this warning:
@@ -55,7 +56,7 @@ import org.slf4j.helpers.MessageFormatter
5556
*
5657
* Parameters without matching arguments are assigned a value of "??"
5758
*/
58-
interface MessageFormat2 {
59+
interface MessageFormat2 : Serializable {
5960
fun format(pattern: String, vararg arguments: Any): String
6061
fun format(mode: MessageFormatMode, pattern: String, vararg arguments: Any): String
6162
}

0 commit comments

Comments
 (0)