Skip to content

Commit e36903c

Browse files
committed
- kotlin 1.2.10, gradle 4.4 (java 9 compatible)
- removed useless .i
1 parent c0deacc commit e36903c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group = 'com.github.kotlin-graphics'
1313

1414
buildscript {
1515

16-
ext.kotlinVersion = '1.2.0'
16+
ext.kotlinVersion = '1.2.10'
1717

1818
repositories {
1919
jcenter() // shadow

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

src/main/kotlin/imgui/font.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,11 +1145,11 @@ class Font {
11451145
wordWidth = 0f
11461146
blankWidth = 0f
11471147
insideWord = true
1148-
s = nextS.i
1148+
s = nextS
11491149
continue
11501150
}
11511151
if (c == '\r') {
1152-
s = nextS.i
1152+
s = nextS
11531153
continue
11541154
}
11551155
}
@@ -1165,7 +1165,7 @@ class Font {
11651165
} else {
11661166
wordWidth += charWidth
11671167
if (insideWord)
1168-
wordEnd = nextS.i
1168+
wordEnd = nextS
11691169
else {
11701170
prevWordEnd = wordEnd
11711171
lineWidth += wordWidth + blankWidth
@@ -1183,7 +1183,7 @@ class Font {
11831183
s = if (prevWordEnd != -1) prevWordEnd else wordEnd
11841184
break
11851185
}
1186-
s = nextS.i
1186+
s = nextS
11871187
}
11881188
return s
11891189
}

0 commit comments

Comments
 (0)