Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright 2017 Sourcerer Inc. All Rights Reserved.

buildscript {
ext.kotlin_version = '1.1.4-2'
ext.kotlin_version = '1.1.51'
repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.1"
classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC2"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.3"
classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.1"
}
}

Expand Down Expand Up @@ -84,32 +84,32 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "com.beust:jcommander:1.72"
compile 'com.google.protobuf:protobuf-java:3.0.0'
compile group: 'commons-codec', name: 'commons-codec', version: '1.5'
compile 'com.google.protobuf:protobuf-java:3.4.0'
compile 'commons-codec:commons-codec:1.5'
compile 'com.fasterxml.jackson.core:jackson-databind:2.8.9'
compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.8.9'
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.9'
compile "io.reactivex.rxjava2:rxjava:2.1.1"
compile 'com.github.kittinunf.fuel:fuel:1.9.0'
compile 'com.github.kittinunf.fuel:fuel-rxjava:1.9.0'
compile group: 'org.eclipse.jgit', name: 'org.eclipse.jgit',
version: '4.8.0.201706111038-r'
compile "org.slf4j:slf4j-nop:1.7.2"
compile 'io.reactivex.rxjava2:rxjava:2.1.6'
compile 'com.github.kittinunf.fuel:fuel:1.11.0'
compile 'com.github.kittinunf.fuel:fuel-rxjava:1.11.0'
compile 'org.eclipse.jgit:org.eclipse.jgit:4.9.0.201710071750-r'
compile 'org.slf4j:slf4j-nop:1.7.2'
compile 'org.jpmml:pmml-evaluator:1.3.9'
compile 'io.sentry:sentry:1.6.0'
compile group: 'net.razorvine', name: 'pyrolite', version: '4.19'
compile 'net.razorvine:pyrolite:4.19'
compile 'org.jpmml:jpmml-converter:1.2.6'

compile name: 'jpmml-sklearn-1.3-SNAPSHOT'

testCompile 'org.jetbrains.kotlin:kotlin-test'
testCompile 'org.jetbrains.spek:spek-api:1.1.4'
testCompile 'org.junit.platform:junit-platform-runner:1.0.0-RC2'
testRuntime 'org.jetbrains.spek:spek-junit-platform-engine:1.1.4'
testCompile 'org.jetbrains.spek:spek-api:1.1.5'
testCompile 'org.junit.platform:junit-platform-runner:1.0.1'
testRuntime 'org.jetbrains.spek:spek-junit-platform-engine:1.1.5'
}

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.0.0"
artifact = "com.google.protobuf:protoc:3.4.0"
}
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/kotlin/app/api/ServerApi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ class ServerApi (private val configurator: Configurator) : Api {
}

private fun cookieResponseInterceptor() = { _: Request, res: Response ->
val newToken = res.httpResponseHeaders[HEADER_SET_COOKIE]
val newToken = res.headers[HEADER_SET_COOKIE]
?.find { it.startsWith(KEY_TOKEN) }
if (newToken != null && newToken.isNotBlank()) {
token = newToken.substringAfter(KEY_TOKEN)
.substringBefore(';')
token = newToken.substringAfter(KEY_TOKEN).substringBefore(';')
}
res
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/app/utils/RequestException.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class RequestException(exception: Exception) : Exception(exception.message) {
var isParseError = false

constructor(fuelError: FuelError) : this(fuelError as Exception) {
httpStatusCode = fuelError.response.httpStatusCode
httpResponseMessage = fuelError.response.httpResponseMessage
httpStatusCode = fuelError.response.statusCode
httpResponseMessage = fuelError.response.responseMessage
httpBodyMessage = fuelError.response.data
.toString(Charset.defaultCharset())
}
Expand Down