Обновление kotlin до 1.3.41

MailRuChamps · Jul 25, 2019 · 3678ca4 · 3678ca4
1 parent b030446
commit 3678ca4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/paperio/dockers/kotlin/Dockerfile b/paperio/dockers/kotlin/Dockerfile
@@ -1,10 +1,11 @@
-FROM stor.highloadcup.ru/aicups/paperio_base
+FROM stest.tech-mail.ru/aicups/paperio_base
 MAINTAINER Evgeniy Zuykin <[email protected]>
+
 RUN apt-get update -y && \
     apt-get install -y software-properties-common && \
     add-apt-repository -y ppa:cwchien/gradle && \
     apt-get update -y && \
-    apt-get install -y openjdk-8-jdk gradle-3.5.1  && \
+    apt-get install -y openjdk-8-jdk gradle-5.5.1  && \
     rm -rf /var/lib/apt/lists/* 
 
 ENV SOLUTION_CODE_ENTRYPOINT=Main.kt

diff --git a/paperio/dockers/kotlin/build.gradle b/paperio/dockers/kotlin/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
     }
 }
 
@@ -24,8 +24,9 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
-    compile 'org.json:json:20180130'
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile 'org.json:json:20180813'
 }
 
 sourceSets {
@@ -44,4 +45,8 @@ build.dependsOn shadowJar
 
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
+
+    dependencies {
+        compile "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:$kotlin_version"
+    }
 }