Skip to content

Commit 8d18a5b

Browse files
committed
Cleaning up for Kotlin 1.3
1 parent 4913329 commit 8d18a5b

File tree

14 files changed

+67
-944
lines changed

14 files changed

+67
-944
lines changed

build.gradle

+67-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
group 'pmhsfelix.kotlin'
1+
group 'org.pedrofelixsour.kotlin'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
@@ -49,12 +49,72 @@ repositories {
4949
dependencies {
5050
compile "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${kotlinVersion}"
5151
compile('org.springframework.boot:spring-boot-starter-web')
52-
compile('com.fasterxml.jackson.module:jackson-module-kotlin')
53-
compile("org.jetbrains.kotlin:kotlin-reflect")
54-
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '0.22.5'
55-
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: '0.22.5'
56-
compile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.4.9'
57-
compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.3'
52+
buildscript {
53+
ext {
54+
kotlin_version = '1.3.0'
55+
springBootVersion = '2.1.0.RELEASE'
56+
}
57+
repositories {
58+
mavenCentral()
59+
maven {
60+
url 'http://dl.bintray.com/kotlin/kotlin-eap'
61+
}
62+
}
63+
dependencies {
64+
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
65+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
66+
classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}")
67+
}
68+
}
69+
70+
group 'org.pedrofelix'
71+
version '1.0-SNAPSHOT'
72+
73+
apply plugin: 'java'
74+
apply plugin: 'kotlin'
75+
// for Spring Boot
76+
apply plugin: 'kotlin-spring'
77+
apply plugin: 'eclipse'
78+
apply plugin: 'org.springframework.boot'
79+
apply plugin: 'io.spring.dependency-management'
80+
81+
sourceCompatibility = 1.8
82+
83+
repositories {
84+
mavenCentral()
85+
maven {
86+
url 'https://dl.bintray.com/kotlin/kotlinx/'
87+
}
88+
}
89+
90+
dependencies {
91+
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
92+
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.0.0'
93+
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-slf4j', version: '1.0.0'
94+
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: '1.0.0'
95+
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
96+
compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.4'
97+
compile group: 'com.fasterxml.jackson.module', name:'jackson-module-kotlin', version: '2.9.7'
98+
compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect'
99+
//compile("org.springframework.boot:spring-boot-starter-undertow") {
100+
// exclude module: "spring-boot-starter-logging"
101+
// exclude module: "logback-classic"
102+
//}
103+
compile("org.springframework.boot:spring-boot-starter-web") {
104+
exclude module: "spring-boot-starter-logging"
105+
exclude module: "logback-classic"
106+
//exclude module: "spring-boot-starter-tomcat"
107+
}
108+
testCompile group: 'junit', name: 'junit', version: '4.12'
109+
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
110+
}
111+
112+
compileKotlin {
113+
kotlinOptions.jvmTarget = "1.8"
114+
}
115+
compileTestKotlin {
116+
kotlinOptions.jvmTarget = "1.8"
117+
}
58118
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
59119
// runtime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
60120
testCompile 'junit:junit:4.12'

src/main/java/org/slf4j/impl/StaticMDCBinder.java

-61
This file was deleted.

src/main/kotlin/pmhsfelix/kotlin/coroutines/SpringApp.kt

-207
This file was deleted.

src/main/kotlin/pmhsfelix/kotlin/coroutines/apache-ext.kt

-34
This file was deleted.

0 commit comments

Comments
 (0)