diff --git a/build.gradle b/build.gradle index bb63585..6c566cf 100644 --- a/build.gradle +++ b/build.gradle @@ -24,11 +24,11 @@ apply plugin: "org.jetbrains.dokka" apply plugin: "maven" apply plugin: "signing" -sourceCompatibility = 1.7 +sourceCompatibility = 1.8 group = "net.aksingh" archivesBaseName = "owm-japis" -version = "2.5.2.1" +version = "2.5.2.2" repositories { mavenCentral() @@ -39,11 +39,11 @@ dependencies { compile "com.google.code.gson:gson:2.8.2" - compile "com.squareup.retrofit2:retrofit:2.3.0" - compile "com.squareup.retrofit2:converter-gson:2.3.0" + compile "com.squareup.retrofit2:retrofit:2.4.0" + compile "com.squareup.retrofit2:converter-gson:2.4.0" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } task javadocJar(type: Jar) { @@ -60,7 +60,7 @@ task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { outputFormat = "javadoc" outputDirectory = "$rootDir/docs" - jdkVersion = 7 + jdkVersion = 8 impliedPlatforms = ["JVM"] } @@ -140,8 +140,8 @@ uploadArchives { } buildscript { - ext.kotlin_version = "1.1.51" - ext.dokka_version = "0.9.15" + ext.kotlin_version = "1.2.30" + ext.dokka_version = "0.9.16" repositories { jcenter() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8008488..ef77f50 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -16,8 +16,7 @@ # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # #################################################################################################### - -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/src/main/kotlin/net/aksingh/owmjapis/core/OWM.kt b/src/main/kotlin/net/aksingh/owmjapis/core/OWM.kt index 85705fe..cd1c67f 100644 --- a/src/main/kotlin/net/aksingh/owmjapis/core/OWM.kt +++ b/src/main/kotlin/net/aksingh/owmjapis/core/OWM.kt @@ -27,6 +27,9 @@ import net.aksingh.owmjapis.util.SystemTools import okhttp3.OkHttpClient import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory +import java.net.InetSocketAddress +import java.net.Proxy +import java.util.* /**