Merge pull request #53 from mapzen/upgrade-kotlin

Upgrade Kotlin version from Beta to RC
mapzen · Mar 22, 2016 · 2f59d22 · 2f59d22
2 parents e874b6f + b96e486
commit 2f59d22
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-  ext.kotlin_version = '1.0.0-beta-1103'
+  ext.kotlin_version = '1.0.1'
 
   repositories {
     mavenCentral()

diff --git a/src/main/java/com/mapzen/valhalla/Route.kt b/src/main/java/com/mapzen/valhalla/Route.kt
@@ -489,7 +489,7 @@ public open class Route {
     }
 
     public open fun getNextInstructionIndex(): Int? {
-        return instructions!!.indexOfRaw(getNextInstruction())
+        return instructions?.indexOf(getNextInstruction())
     }
 
     public open fun getCurrentInstruction(): Instruction {

diff --git a/src/test/java/com/mapzen/valhalla/RouteTest.java b/src/test/java/com/mapzen/valhalla/RouteTest.java
@@ -49,7 +49,7 @@ public void hasCorrectTotalDistance() throws Exception {
     public void shouldConvertTotalDistanceInMilesToMeters() throws Exception {
         route = getRoute("valhalla_miles");
         assertThat(route.getTotalDistance())
-                .isEqualTo((int) Math.round(0.712 * Instruction.MI_TO_METERS));
+                .isEqualTo((int) Math.round(0.712 * Instruction.Companion.getMI_TO_METERS()));
     }
 
     @Test