Merge pull request #56 from DanilaFe/version-update

Bump Gradle, Kotlin, and toml4j versions.
2026-01-27 00:55:19 +00:00 · 2018-05-18 15:25:16 -07:00 · 2018-05-18 15:19:53 -07:00 · 2018-01-30 21:12:29 -08:00 · 2018-01-30 21:10:02 -08:00 · 2018-01-16 00:16:46 -08:00
6 changed files with 9 additions and 10 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
-    ext.kotlin_version = '1.1.3'
-    ext.dokka_version = '0.9.15'
+    ext.kotlin_version = '1.2.40'
+    ext.dokka_version = '0.9.16'

    repositories {
        jcenter()
@@ -23,7 +23,7 @@ subprojects {
    }

    dependencies {
-        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.3"
+        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.40"
    }
 }

--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNegate.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNegate.kt
@@ -11,7 +11,7 @@ import org.nwapw.abacus.number.NumberInterface
 *
 * This is a standard operator that negates a number.
 */
-class OperatorNegate: NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_PREFIX, 0) {
+class OperatorNegate: NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_PREFIX, 1) {

    override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
            params.size == 1
--- a/fx/build.gradle
+++ b/fx/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'application'

 dependencies {
-    compile 'com.moandjiezana.toml:toml4j:0.7.1'
+    compile 'com.moandjiezana.toml:toml4j:0.7.2'
    compile project(':core')
 }

--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jul 28 17:18:51 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
Author	SHA1	Message	Date
Danila	15394b7ea0	Merge pull request #56 from DanilaFe/version-update Bump Gradle, Kotlin, and toml4j versions.	2018-05-18 15:25:16 -07:00
Danila Fedorin	cc2da711e7	Bump Gradle, Kotlin, and toml4j versions. Apparently, Gradle was incompatible with Java 10, and neither was toml4j.	2018-05-18 15:19:53 -07:00
Danila	ef39bcbaa2	Merge pull request #55 from DanilaFe/unary-minus-fix Fix bug causing incorrect parsing of inputs with negative signs.	2018-01-30 21:12:29 -08:00
Danila Fedorin	ac17246317	Fix bug causing incorrect parsing of inputs with negative signs.	2018-01-30 21:10:02 -08:00
Danila	18e0bdebc5	Merge pull request #54 from DanilaFe/precedence-fix Make sure the set and define operators have the lowest precedence.	2018-01-16 00:16:46 -08:00