From 1b82b165f1fe877e7356acf800fc18d1a353c2da Mon Sep 17 00:00:00 2001 From: imkiva Date: Thu, 8 Nov 2018 23:31:34 +0800 Subject: [PATCH] project: upgrade gradle and kotlin --- NeoLang/src/main/java/io/neolang/runtime/type/NeoLangValue.kt | 2 +- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NeoLang/src/main/java/io/neolang/runtime/type/NeoLangValue.kt b/NeoLang/src/main/java/io/neolang/runtime/type/NeoLangValue.kt index ab7b0b0..be9190f 100644 --- a/NeoLang/src/main/java/io/neolang/runtime/type/NeoLangValue.kt +++ b/NeoLang/src/main/java/io/neolang/runtime/type/NeoLangValue.kt @@ -15,7 +15,7 @@ class NeoLangValue(private val rawValue: Any) { try { return rawValue.toString().toDouble() - } catch (e: NumberFormatException) { + } catch (e: Throwable) { return 0.0 } } diff --git a/build.gradle b/build.gradle index bbd8282..121a7df 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { ext.android = [ ANDROID_SUPPORT_VERSION: '27.0.2', - KOTLIN_VERSION : '1.2.30', + KOTLIN_VERSION : '1.2.51', MIN_SDK_VERSION : 21, @@ -54,7 +54,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.2.1' classpath rootProject.ext.deps["kotlin-gradle-plugin"] // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3dced4c..4b1859f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Apr 01 00:43:41 CST 2018 +#Thu Nov 08 23:25:07 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip