Skip to content

Upgrade kotlin to 1.3 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2018
Merged

Upgrade kotlin to 1.3 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion oauth2-server-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk</artifactId>
<version>1.8.6</version>
<version>1.8.12.kotlin13</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions oauth2-server-ktor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
<artifactId>oauth2-server-ktor</artifactId>

<properties>
<ktor.version>0.9.5</ktor.version>
<serialization.version>0.6.1</serialization.version>
<ktor.version>1.0.0-beta-4</ktor.version>
</properties>


Expand Down
2 changes: 1 addition & 1 deletion oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/request/KtorCallContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import io.ktor.response.header
import io.ktor.response.respondRedirect
import io.ktor.response.respondText
import io.ktor.util.toMap
import kotlinx.coroutines.experimental.runBlocking
import kotlinx.coroutines.runBlocking
import nl.myndocs.oauth2.json.JsonMapper
import nl.myndocs.oauth2.request.CallContext

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<version>0.2.2</version>

<properties>
<kotlin.version>1.2.60</kotlin.version>
<kotlin.version>1.3.0</kotlin.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
Expand Down