diff --git a/Kotlin/build.gradle b/Kotlin/build.gradle index aaa9d72b..e5dc89df 100644 --- a/Kotlin/build.gradle +++ b/Kotlin/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.2.21' + ext.kotlin_version = '1.3.41' repositories { mavenCentral() @@ -11,7 +11,7 @@ buildscript { } plugins { - id "org.jetbrains.kotlin.jvm" version "1.2.21" + id "org.jetbrains.kotlin.jvm" version "1.3.41" } apply plugin: 'kotlin' diff --git a/Kotlin/gradle/wrapper/gradle-wrapper.jar b/Kotlin/gradle/wrapper/gradle-wrapper.jar index 01b8bf6b..758de960 100644 Binary files a/Kotlin/gradle/wrapper/gradle-wrapper.jar and b/Kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Kotlin/gradle/wrapper/gradle-wrapper.properties b/Kotlin/gradle/wrapper/gradle-wrapper.properties index 933b6473..a0d751ae 100644 --- a/Kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/Kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Nov 20 10:18:48 CET 2019 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt index a78cd532..077867b6 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/GildedRose.kt @@ -4,9 +4,9 @@ class GildedRose(var items: Array) { fun updateQuality() { for (i in items.indices) { - if (!items[i].name.equals("Aged Brie") && !items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) { + if (items[i].name != "Aged Brie" && items[i].name != "Backstage passes to a TAFKAL80ETC concert") { if (items[i].quality > 0) { - if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) { + if (items[i].name != "Sulfuras, Hand of Ragnaros") { items[i].quality = items[i].quality - 1 } } @@ -14,7 +14,7 @@ class GildedRose(var items: Array) { if (items[i].quality < 50) { items[i].quality = items[i].quality + 1 - if (items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) { + if (items[i].name == "Backstage passes to a TAFKAL80ETC concert") { if (items[i].sellIn < 11) { if (items[i].quality < 50) { items[i].quality = items[i].quality + 1 @@ -30,15 +30,15 @@ class GildedRose(var items: Array) { } } - if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) { + if (items[i].name != "Sulfuras, Hand of Ragnaros") { items[i].sellIn = items[i].sellIn - 1 } if (items[i].sellIn < 0) { - if (!items[i].name.equals("Aged Brie")) { - if (!items[i].name.equals("Backstage passes to a TAFKAL80ETC concert")) { + if (items[i].name != "Aged Brie") { + if (items[i].name != "Backstage passes to a TAFKAL80ETC concert") { if (items[i].quality > 0) { - if (!items[i].name.equals("Sulfuras, Hand of Ragnaros")) { + if (items[i].name != "Sulfuras, Hand of Ragnaros") { items[i].quality = items[i].quality - 1 } } diff --git a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt b/Kotlin/src/main/kotlin/com/gildedrose/Item.kt index 29d714ba..eaf62a40 100644 --- a/Kotlin/src/main/kotlin/com/gildedrose/Item.kt +++ b/Kotlin/src/main/kotlin/com/gildedrose/Item.kt @@ -1,3 +1,7 @@ package com.gildedrose -data class Item(var name: String, var sellIn: Int, var quality: Int) \ No newline at end of file +open class Item(var name: String, var sellIn: Int, var quality: Int) { + override fun toString(): String { + return this.name + ", " + this.sellIn + ", " + this.quality + } +} \ No newline at end of file