Update dependencies (#35 #36)

build.gradle.kts

@@ -51,17 +51,17 @@ version = linguaVersion
 description = linguaDescription
 
 plugins {
-    kotlin("jvm") version "1.3.61"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.3.61"
+    kotlin("jvm") version "1.3.72"
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.3.72"
     id("com.adarshr.test-logger") version "2.0.0"
-    id("org.jetbrains.dokka") version "0.10.0"
-    id("ru.vyarus.use-python") version "1.2.0"
-    id("com.jfrog.bintray") version "1.8.4"
+    id("org.jetbrains.dokka") version "0.10.1"
+    id("ru.vyarus.use-python") version "2.2.0"
+    id("com.jfrog.bintray") version "1.8.5"
     `maven-publish`
     jacoco
 }
 
-jacoco.toolVersion = "0.8.4"
+jacoco.toolVersion = "0.8.5"
 
 sourceSets {
     main {
@@ -285,15 +285,15 @@ tasks.register<JavaExec>("runLinguaOnConsole") {
 
 dependencies {
     implementation(kotlin("stdlib"))
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.5.2")
-    testImplementation("org.assertj:assertj-core:3.14.0")
-    testImplementation("io.mockk:mockk:1.9.3")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
+    testImplementation("org.assertj:assertj-core:3.16.1")
+    testImplementation("io.mockk:mockk:1.10.0")
 
     testImplementation("com.optimaize.languagedetector:language-detector:0.6")
-    testImplementation("org.apache.opennlp:opennlp-tools:1.9.1")
-    testImplementation("org.apache.tika:tika-langdetect:1.23")
+    testImplementation("org.apache.opennlp:opennlp-tools:1.9.2")
+    testImplementation("org.apache.tika:tika-langdetect:1.24.1")
 
     val slf4jVersion = "1.7.25"
 
@@ -302,10 +302,10 @@ dependencies {
 }
 
 python {
-    pip("matplotlib:3.1.1")
-    pip("seaborn:0.9.0")
-    pip("pandas:0.25.3")
-    pip("numpy:1.17.0")
+    pip("matplotlib:3.2.1")
+    pip("seaborn:0.10.1")
+    pip("pandas:1.0.3")
+    pip("numpy:1.18.0")
 }
 
 bintray {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/com/github/pemistahl/lingua/internal/Fraction.kt

@@ -19,11 +19,10 @@ package com.github.pemistahl.lingua.internal
 import kotlinx.serialization.Decoder
 import kotlinx.serialization.Encoder
 import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialDescriptor
+import kotlinx.serialization.PrimitiveDescriptor
+import kotlinx.serialization.PrimitiveKind
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Serializer
-import kotlinx.serialization.internal.StringDescriptor
-import kotlinx.serialization.withName
 
 @Serializable
 internal data class Fraction(
@@ -180,10 +179,10 @@ internal data class Fraction(
 
     @Serializer(forClass = Fraction::class)
     companion object : KSerializer<Fraction> {
-        override val descriptor: SerialDescriptor = StringDescriptor.withName("Fraction")
+        override val descriptor = PrimitiveDescriptor("Fraction", PrimitiveKind.STRING)
 
-        override fun serialize(encoder: Encoder, obj: Fraction) {
-            encoder.encodeString(obj.toString())
+        override fun serialize(encoder: Encoder, value: Fraction) {
+            encoder.encodeString(value.toString())
         }
 
         override fun deserialize(decoder: Decoder): Fraction {

src/main/kotlin/com/github/pemistahl/lingua/internal/Ngram.kt

@@ -19,11 +19,10 @@ package com.github.pemistahl.lingua.internal
 import kotlinx.serialization.Decoder
 import kotlinx.serialization.Encoder
 import kotlinx.serialization.KSerializer
-import kotlinx.serialization.SerialDescriptor
+import kotlinx.serialization.PrimitiveDescriptor
+import kotlinx.serialization.PrimitiveKind
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Serializer
-import kotlinx.serialization.internal.StringDescriptor
-import kotlinx.serialization.withName
 
 @Serializable
 internal data class Ngram(val value: String) : Comparable<Ngram> {
@@ -53,10 +52,10 @@ internal data class Ngram(val value: String) : Comparable<Ngram> {
 
     @Serializer(forClass = Ngram::class)
     companion object : KSerializer<Ngram> {
-        override val descriptor: SerialDescriptor = StringDescriptor.withName("Ngram")
+        override val descriptor = PrimitiveDescriptor("Ngram", PrimitiveKind.STRING)
 
-        override fun serialize(encoder: Encoder, obj: Ngram) {
-            encoder.encodeString(obj.toString())
+        override fun serialize(encoder: Encoder, value: Ngram) {
+            encoder.encodeString(value.toString())
         }
 
         override fun deserialize(decoder: Decoder): Ngram {
@@ -84,7 +83,7 @@ internal data class NgramRange(
         }
     }
 
-    override fun contains(value: Ngram): Boolean = value <= start && value >= endInclusive
+    override fun contains(value: Ngram): Boolean = value in endInclusive..start
 
     override fun iterator(): Iterator<Ngram> = NgramIterator(start)
 }

src/python-scripts/draw_accuracy_plots.py

@@ -38,7 +38,7 @@ class AccuracyPlotDrawer(object):
     __plot_titles = ('Single Word Detection', 'Word Pair Detection', 'Sentence Detection', 'Average Detection')
     __column_prefixes = ('single-words', 'word-pairs', 'sentences', 'average')
     __column_suffixes = ('optimaize', 'opennlp', 'tika', 'lingua')
-    __legend_labels = ('Optimaize 0.6', 'OpenNLP 1.9.1', 'Tika 1.23', 'Lingua 0.6.1')
+    __legend_labels = ('Optimaize 0.6', 'OpenNLP 1.9.2', 'Tika 1.24.1', 'Lingua 1.0.0')
     __hatches = ('/', '+', '.', 'O')
     __palette = ('#b259ff', '#ff6347', '#ffc400', '#41c46b')
     __ticks = np.arange(0, 101, 10)