Skip to content

Commit 87c5c00

Browse files
author
Sergey Mashkov
committed
Migrate to M11
1 parent 04d3878 commit 87c5c00

34 files changed

+123
-255
lines changed

‎.idea/libraries/Gradle__junit_4_11.xml renamed to ‎.idea/libraries/Gradle__junit_junit_4_11.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Gradle__kotlin_runtime_0_1_SNAPSHOT.xml

-11
This file was deleted.

‎.idea/libraries/Gradle__kotlin_runtime_0_7_270.xml

-11
This file was deleted.

‎.idea/libraries/Gradle__kotlin_stdlib_0_1_SNAPSHOT.xml

-11
This file was deleted.

‎.idea/libraries/Gradle__kotlin_stdlib_0_7_270.xml

-11
This file was deleted.

‎.idea/libraries/Gradle__hamcrest_core_1_3.xml renamed to ‎.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Gradle__org_jetbrains_spek_spek_0_1_SNAPSHOT.xml

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Gradle__spek_0_1_118.xml

-11
This file was deleted.

‎.idea/libraries/Gradle__spek_0_1_SNAPSHOT.xml

-11
This file was deleted.

‎.idea/misc.xml

+3-102
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Humanizer.jvm.tests.iml

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.0" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
2+
<module external.linked.project.id="Humanizer.jvm.tests" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.0" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/build/classes/main" />
5+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
46
<exclude-output />
57
<content url="file://$MODULE_DIR$">
6-
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
78
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
10+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
811
<sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
912
<sourceFolder url="file://$MODULE_DIR$/test/main/kotlin" isTestSource="true" />
10-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
1113
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
1214
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
1315
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1416
<excludeFolder url="file://$MODULE_DIR$/build" />
1517
</content>
1618
<orderEntry type="inheritedJdk" />
1719
<orderEntry type="sourceFolder" forTests="false" />
18-
<orderEntry type="library" exported="" name="Gradle: kotlin-stdlib-0.1-SNAPSHOT" level="project" />
19-
<orderEntry type="library" exported="" name="Gradle: spek-0.1-SNAPSHOT" level="project" />
20-
<orderEntry type="library" exported="" name="Gradle: kotlin-runtime-0.1-SNAPSHOT" level="project" />
21-
<orderEntry type="library" exported="" name="Gradle: hamcrest-core-1.3" level="project" />
22-
<orderEntry type="library" exported="" name="Gradle: junit-4.11" level="project" />
20+
<orderEntry type="library" exported="" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT" level="project" />
21+
<orderEntry type="library" exported="" name="Gradle: org.jetbrains.spek:spek:0.1-SNAPSHOT" level="project" />
22+
<orderEntry type="library" exported="" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:0.1-SNAPSHOT" level="project" />
23+
<orderEntry type="library" exported="" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
24+
<orderEntry type="library" exported="" name="Gradle: junit:junit:4.11" level="project" />
2325
</component>
24-
</module>
25-
26+
</module>

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ sourceSets {
4343
dependencies {
4444
testCompile group: 'junit', name: 'junit', version: '4.11'
4545
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
46-
compile "org.spek:spek:0.1-SNAPSHOT"
46+
compile "org.jetbrains.spek:spek:0.1-SNAPSHOT"
4747

4848
}
4949

@@ -74,4 +74,4 @@ task wrapper(type: Wrapper) {
7474
"set GRADLE_OPTS=$gradleOpts %GRADLE_OPTS%\nset DEFAULT_JVM_OPTS=")
7575

7676
}
77-
}
77+
}

‎src/main/kotlin/org/humanizer/jvm/DeHumanize.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ fun String.dehumanize() : String
55
return this
66
.split(" ")
77
.let{it.map{it.capitalize()}}
8-
.makeString("")
8+
.join("")
99
}

‎src/main/kotlin/org/humanizer/jvm/NumberToWords.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.humanizer.jvm
22

3-
import java.util.ArrayList
3+
import org.humanizer.jvm.localisation
44
import java.util.Locale
55

66
fun Int.toWords(): String {

‎src/main/kotlin/org/humanizer/jvm/RomanNumeral.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ fun Int.toRoman() : String
3030

3131
fun String.fromRoman() : Int
3232
{
33-
var input = this.trim().toUpperCase();
33+
var input = this.trim().toUpperCase()
3434

35-
var length = input.length;
35+
var length = input.length()
3636

3737
if ((length == 0) || input.isInvalidRomanNumeral())
38-
throw ArgumentException("Empty or invalid Roman numeral string. The input was $input.");
38+
throw ArgumentException("Empty or invalid Roman numeral string. The input was $input.")
3939

40-
var total = 0;
41-
var i = length;
40+
var total = 0
41+
var i = length()
4242

4343
while (i > 0)
4444
{

‎src/main/kotlin/org/humanizer/jvm/Truncators.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ package org.humanizer.jvm
22

33
fun truncateFixedLength(value: String, length: Int, truncationString: String, truncateFrom: TruncateFrom) : String
44
{
5-
var adjustedLength = length - (truncationString.length - 1)
5+
var adjustedLength = length - (truncationString.length() - 1)
66
var adjustedTruncationString = truncationString
77
if(adjustedLength <= 0) {
88
adjustedLength = length + 1
99
adjustedTruncationString = ""
1010
}
11-
if (value.length <= length) return value
12-
if (truncateFrom == TruncateFrom.Left) return "${adjustedTruncationString}${value.substring(value.length - adjustedLength + 1, value.length)}"
11+
if (value.length() <= length) return value
12+
if (truncateFrom == TruncateFrom.Left) return "${adjustedTruncationString}${value.substring(value.length() - adjustedLength + 1, value.length())}"
1313
return "${value.substring(0, adjustedLength - 1)}${adjustedTruncationString}"
1414
}
1515

1616
fun truncateFixedNumberOfCharacters(value: String, length: Int, truncationString: String, truncateFrom: TruncateFrom) : String {
17-
var adjustedLength = length - (truncationString.length - 1)
17+
var adjustedLength = length - (truncationString.length() - 1)
1818
var adjustedTruncationString = truncationString
1919
if (adjustedLength <= 0) {
2020
adjustedLength = length + 1
@@ -59,7 +59,7 @@ fun truncateFixedNumberOfWords(value: String, length: Int, truncationString: Str
5959
else {
6060
var t = ""
6161
var l2 = 0
62-
value.trimTrailing().reverse().forEach {
62+
value.trimEnd().reverse().forEach {
6363
if (Character.isWhitespace(it)) l2++
6464
if(length > l2){ t = t+it}
6565
}

‎src/main/kotlin/org/humanizer/jvm/letterCasing/LetterCasings.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fun String.letterCasingTitle(): String {
2121
return this
2222
.split(letterCasingRegex("|(_)|(-)"))
2323
.let{ it.map{ if(it.checkAllCaps() && it.length() > 1) it else it.capitalize()} }
24-
.makeString(" ")
24+
.join(" ")
2525
}
2626

2727
fun String.letterCasingLowerCase() : String {
@@ -39,7 +39,7 @@ fun String.letterCasingSentence(): String {
3939
return this
4040
.split(letterCasingRegex())
4141
.let{ it.map{ if(it.checkAllCaps() && it.length() > 1) it else it.toLowerCase()} }
42-
.makeString(" ")
42+
.join(" ")
4343
.capitalize()
4444
.replace(" i ", " I ")
4545
}

0 commit comments

Comments
 (0)