Skip to content

Commit b856fbf

Browse files
committed
Update Gradle and Kotlin version, fix compilation
1 parent 3c30885 commit b856fbf

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed
Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.1.2'
2+
ext.kotlin_version = '1.3.10'
33
repositories {
44
jcenter()
55
}
@@ -19,16 +19,3 @@ dependencies {
1919
compile group: 'javax', name: 'javaee-api', version: '7.0'
2020
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
2121
}
22-
23-
sourceSets {
24-
main {
25-
kotlin {
26-
srcDir "src/main/kotlin"
27-
}
28-
}
29-
test {
30-
kotlin {
31-
srcDir "test/main/kotlin"
32-
}
33-
}
34-
}

tutorials/servlet-web-applications/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

tutorials/servlet-web-applications/src/main/kotlin/HomeController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServlet
55
import javax.servlet.http.HttpServletRequest
66
import javax.servlet.http.HttpServletResponse
77

8-
@WebServlet(name = "Hello", value = "/hello")
8+
@WebServlet(name = "Hello", value = ["/hello"])
99
class HomeController : HttpServlet() {
1010
override fun doGet(req: HttpServletRequest, res: HttpServletResponse) {
1111
res.writer.write("Hello, World!")

0 commit comments

Comments
 (0)