From 820ed250fe74d8aac1470d17f5249f9c55afb77c Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 26 Nov 2019 21:21:29 +0300
Subject: [PATCH] build: advance versions

---
 build.gradle      | 22 +++++++++++-----------
 gradle.properties |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index a311bcf..509f12a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 plugins {
-  id "org.jetbrains.intellij" version "0.4.10"
+  id "org.jetbrains.intellij" version "0.4.14"
 }
 
 version = "${version}"
@@ -20,10 +20,12 @@ allprojects {
 
   sourceCompatibility = javaVersion
   targetCompatibility = javaVersion
-
-  tasks.compileKotlin.kotlinOptions.apiVersion = kotlinApiVersion
-  tasks.compileTestKotlin.kotlinOptions.apiVersion = kotlinApiVersion
-
+  tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+      jvmTarget = javaVersion
+      apiVersion = kotlinApiVersion
+    }
+  }
   sourceSets {
     main {
       java.srcDirs "src", "gen"
@@ -53,8 +55,8 @@ repositories {
   maven { url "http://clojars.org/repo" }
 }
 dependencies {
-  testRuntime "org.clojure:clojure:1.10.0"
-  testRuntime "org.clojure:clojurescript:1.10.439"
+  testRuntime "org.clojure:clojure:1.10.1"
+  testRuntime "org.clojure:clojurescript:1.10.597"
   compile files("${System.properties['java.home']}/../lib/tools.jar")
 }
 
@@ -69,15 +71,13 @@ test {
 }
 
 task plugin_jar(type: Jar, dependsOn: [rootProject.tasks["assemble"]]) {
-  baseName = "clojure-kit"
-  destinationDir = file(artifactsPath)
+  archiveBaseName.set("clojure-kit")
   manifest { from "$rootDir/resources/META-INF/MANIFEST.MF" }
   from(rootProject.sourceSets.main.output)
 }
 
 task plugin_zip(type: Zip, dependsOn: [plugin_jar]) {
-  baseName = "ClojureKit"
-  destinationDir = file(artifactsPath)
+  archiveBaseName.set("ClojureKit")
   from(tasks["plugin_jar"].outputs) {
     into "/ClojureKit/lib"
   }
diff --git a/gradle.properties b/gradle.properties
index c52839a..f16e69c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,11 @@
 # Available idea versions:
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
-version=2019.3.1-snapshot
+version=2019.3.2-snapshot
 
-ideaVersion=193.3519.25-EAP-SNAPSHOT
+ideaVersion=193.5233.57-EAP-SNAPSHOT
 javaVersion=1.8
-kotlinVersion=1.3.50
+kotlinVersion=1.3.60
 kotlinApiVersion=1.3
 
 artifactsPath=build/artifacts