Updated dependencies.

.gitignore

@@ -1,48 +1,88 @@
+__pycache__
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/settings.json
 !.vscode/tasks.json
-**/*.class
+!gradle-wrapper.jar
-**/.idea/$CACHE_FILE$
-**/.idea/$PRODUCT_WORKSPACE_FILE$
-**/.idea/**/dataSources.ids
-**/.idea/**/dataSources.local.xml
-**/.idea/**/dataSources/
-**/.idea/**/dbnavigator.xml
-**/.idea/**/dictionaries
-**/.idea/**/dynamic.xml
-**/.idea/**/gradle.xml
-**/.idea/**/libraries
-**/.idea/**/shelf
-**/.idea/**/sqlDataSources.xml
-**/.idea/**/tasks.xml
-**/.idea/**/uiDesigner.xml
-**/.idea/**/usage.statistics.xml
-**/.idea/**/workspace.xml
-*.code-workspace
-*.iws
-*.sublime-*
-.DS_Store
 .classpath
+.classpath
+.DS_Store
 .gradle
+.history
 .kobalt
+.mtj.tmp/
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
 .nb-gradle
 .project
+.scannerwork
 .settings
 .vscode/*
-/bin
+*.class
-/build
+*.code-workspace
-/deploy
+*.ctxt
-/dist
+*.ear
-/gen
+*.iws
-/gradle.properties
+*.jar
-/local.properties
+*.log
-/out
+*.nar
-/proguard-project.txt
+*.rar
-/project.properties
+*.sublime-*
-/target
+*.tar.gz
-/test-output
+*.war
-Thumbs.db
+*.zip
+/**/.idea_modules/
+/**/.idea/**/caches/build_file_checksums.ser
+/**/.idea/**/contentModel.xml
+/**/.idea/**/dataSources.ids
+/**/.idea/**/dataSources.local.xml
+/**/.idea/**/dataSources/
+/**/.idea/**/dbnavigator.xml
+/**/.idea/**/dictionaries
+/**/.idea/**/dynamic.xml
+/**/.idea/**/gradle.xml
+/**/.idea/**/httpRequests
+/**/.idea/**/libraries
+/**/.idea/**/mongoSettings.xml
+/**/.idea/**/replstate.xml
+/**/.idea/**/shelf
+/**/.idea/**/shelf/
+/**/.idea/**/sqlDataSources.xml
+/**/.idea/**/tasks.xml
+/**/.idea/**/uiDesigner.xml
+/**/.idea/**/usage.statistics.xml
+/**/.idea/**/workspace.xml
+/**/.idea/$CACHE_FILE$
+/**/.idea/$PRODUCT_WORKSPACE_FILE$
+atlassian-ide-plugin.xml
+bin/
+build/
+cmake-build-*/
+com_crashlytics_export_strings.xml
+crashlytics-build.properties
+crashlytics.properties
+dependency-reduced-pom.xml
+deploy/
+dist/
 ehthumbs.db
+fabric.properties
+gen/
+gradle.properties
+hs_err_pid*
 kobaltBuild
 kobaltw*-test
+lib/kotlin*
+libs/
+local.properties
+out/
+pom.xml.next
+pom.xml.releaseBackup
+pom.xml.tag
+pom.xml.versionsBackup
+proguard-project.txt
+project.properties
+release.properties
+target/
+test-output
+Thumbs.db
+venv

build.gradle.kts

@@ -11,12 +11,12 @@ plugins {
     `maven-publish`
     id("com.github.ben-manes.versions") version "0.27.0"
     id("com.jfrog.bintray") version "1.8.4"
-    id("io.gitlab.arturbosch.detekt") version "1.2.2"
+    id("io.gitlab.arturbosch.detekt") version "1.5.1"
     id("net.thauvin.erik.gradle.semver") version "1.0.4"
-    id("org.jetbrains.dokka") version "0.10.0"
+    id("org.jetbrains.dokka") version "0.10.1"
     id("org.jetbrains.kotlin.kapt").version("1.3.61")
     id("org.jetbrains.kotlin.plugin.serialization").version("1.3.61")
-    id("org.jmailen.kotlinter") version "2.2.0"
+    id("org.jmailen.kotlinter") version "2.3.0"
     id("org.sonarqube") version "2.8"
 }
 
@@ -32,6 +32,12 @@ var semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
 val publicationName = "mavenJava"
 
+object VersionInfo {
+    const val okhttp = "4.3.1"
+}
+
+val versions: VersionInfo by extra { VersionInfo }
+
 // Load local.properties
 File("local.properties").apply {
     if (exists()) {
@@ -55,14 +61,15 @@ dependencies {
     compileOnly(semverProcessor)
 
     compile("javax.servlet:javax.servlet-api:4.0.1")
-    compile("com.squareup.okhttp3:okhttp:4.2.2")
+
-    compile("com.squareup.okhttp3:logging-interceptor:4.2.2")
+    compile("com.squareup.okhttp3:okhttp:${versions.okhttp}")
+    compile("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
 
     compile(kotlin("stdlib"))
     compile("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0")
 
-    testImplementation("org.mockito:mockito-core:3.2.0")
+    testImplementation("org.mockito:mockito-core:3.2.4")
-    testImplementation("org.testng:testng:7.1.0")
+    testImplementation("org.testng:testng:7.1.1")
 }
 
 kapt {
@@ -72,8 +79,8 @@ kapt {
 }
 
 detekt {
-    input = files("src/main/kotlin", "src/test/kotlin")
+    //input = files("src/main/kotlin", "src/test/kotlin")
-    filters = ".*/resources/.*,.*/build/.*"
+    //filters = ".*/resources/.*,.*/build/.*"
     baseline = project.rootDir.resolve("detekt-baseline.xml")
 }
 

config/detekt/detekt.yml

@@ -115,7 +115,7 @@ empty-blocks:
     active: true
   EmptyFunctionBlock:
     active: true
-    ignoreOverriddenFunctions: false
+    ignoreOverridden: false
   EmptyIfBlock:
     active: true
   EmptyInitBlock:
@@ -320,7 +320,7 @@ naming:
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     parameterPattern: '[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverriddenFunctions: true
+    ignoreOverridden: true
   InvalidPackageDeclaration:
     active: false
     rootPackage: ''
@@ -328,7 +328,7 @@ naming:
     active: true
   MemberNameEqualsClassName:
     active: false
-    ignoreOverriddenFunction: true
+    ignoreOverridden: true
   ObjectPropertyNaming:
     active: true
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
+        0) set -- ;;
-        (1) set -- "$args0" ;;
+        1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
+        2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"