COINS-2249 | Increased OkHttp timeouts (#15)

* COINS-2249 | Update Kotlin to version 1.4.30

* COINS-2249 | Update Gradle wrapper to version 6.8.2

* COINS-2249 | Increase OkHttp timeouts to 30s

* COINS-2249 | Fix imports in jUnit tests

build.gradle

@@ -5,12 +5,12 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"
     }
 }
 plugins {
     id "java"
-    id "org.jetbrains.kotlin.jvm" version "1.3.72"
+    id "org.jetbrains.kotlin.jvm" version "1.4.30"
     id "com.jfrog.bintray" version "1.7.3"
     id "maven-publish"
 }

buildsystem/dependencies.gradle

@@ -1,6 +1,6 @@
 ext {
     // Kotlin
-    kotlinVersion = '1.3.72'
+    kotlinVersion = '1.4.30'
     kotlinCoroutinesVersion = '1.3.5'
 
     // Reactive programming

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/main/java/com/coinpaprika/apiclient/api/CoinpaprikaApiFactory.kt

@@ -16,10 +16,10 @@ import java.util.concurrent.TimeUnit
 fun defaultClient(): OkHttpClient.Builder {
     return OkHttpClient.Builder()
         .protocols(listOf(Protocol.HTTP_1_1, Protocol.HTTP_2))
-        .writeTimeout(20000, TimeUnit.MILLISECONDS)
-        .readTimeout(10000, TimeUnit.MILLISECONDS)
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .writeTimeout(30, TimeUnit.SECONDS)
         .retryOnConnectionFailure(true)
-        .connectTimeout(15000, TimeUnit.MILLISECONDS)
         .connectionPool(ConnectionPool(0, 1, TimeUnit.NANOSECONDS))
 }
 

src/test/java/com/coinpaprika/apiclient/repository/ranking/RankingApiTest.kt

@@ -1,8 +1,8 @@
 package com.coinpaprika.apiclient.repository.ranking
 
 import com.coinpaprika.apiclient.entity.TopMoversEntity
-import junit.framework.Assert.assertEquals
 import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock

src/test/java/com/coinpaprika/apiclient/repository/search/SearchApiTest.kt

@@ -1,7 +1,7 @@
 package com.coinpaprika.apiclient.repository.search
 
 import com.coinpaprika.apiclient.entity.SearchEntity
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith

src/test/java/com/coinpaprika/apiclient/repository/tag/TagApiTest.kt

@@ -1,7 +1,7 @@
 package com.coinpaprika.apiclient.repository.tag
 
 import com.coinpaprika.apiclient.entity.TagEntity
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith