build: update versions

build.gradle

@@ -1,66 +1,60 @@
-buildscript {
-  repositories {
-    mavenCentral()
-  }
-  dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-  }
-}
-
 plugins {
-  id "org.jetbrains.intellij" version "0.4.19"
+  id "org.jetbrains.kotlin.jvm" version "$kotlinVersion"
+  id 'org.jetbrains.intellij' version "$ijpVersion"
 }
 
-version = "${version}"
+version = "$pluginVersion"
 defaultTasks "clean", "artifacts", "test"
 
-allprojects {
-  apply plugin: "java"
-  apply plugin: "kotlin"
+repositories {
+  mavenCentral()
+}
+apply plugin: "java"
+apply plugin: "kotlin"
 
-  sourceCompatibility = javaVersion
-  targetCompatibility = javaVersion
-  tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-      jvmTarget = javaVersion
-      apiVersion = kotlinApiVersion
-    }
-  }
-  sourceSets {
-    main {
-      java.srcDirs "src", "gen"
-      kotlin.srcDirs "src"
-      resources.srcDirs "resources"
-    }
-    test {
-      kotlin.srcDirs "tests"
-    }
+sourceCompatibility = javaVersion
+targetCompatibility = javaVersion
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+  kotlinOptions {
+    jvmTarget = javaVersion
+    apiVersion = kotlinApiVersion
   }
-  apply plugin: 'idea'
-  idea.module {
-    generatedSourceDirs += file('gen')
+}
+sourceSets {
+  main {
+    java.srcDirs "src", "gen"
+    kotlin.srcDirs "src"
+    resources.srcDirs "resources"
   }
-  apply plugin: "org.jetbrains.intellij"
-  intellij {
-    version ideaVersion
-    type "IC"
-    plugins 'copyright', 'java'
-    updateSinceUntilBuild false
-    downloadSources = false
+  test {
+    kotlin.srcDirs "tests"
   }
 }
-
-repositories {
-  mavenCentral()
-  maven { url "http://clojars.org/repo" }
+apply plugin: 'idea'
+idea.module {
+  generatedSourceDirs += file('gen')
 }
-dependencies {
-  testRuntime "org.clojure:clojure:1.10.2-alpha1"
-  testRuntime "org.clojure:clojurescript:1.10.758"
-  compile files("${System.properties['java.home']}/../lib/tools.jar")
+apply plugin: "org.jetbrains.intellij"
+intellij {
+  version ideaVersion
+  type "IC"
+  plugins 'copyright', 'java'
+  updateSinceUntilBuild false
+  downloadSources = false
 }
+buildSearchableOptions.enabled = false
 
 test {
+  repositories {
+    mavenCentral()
+    maven { url "http://clojars.org/repo" }
+  }
+  dependencies {
+    testRuntime "org.clojure:clojure:$clojureVersion"
+    testRuntime "org.clojure:clojurescript:$cljsVersion"
+    compile files("${System.properties['java.home']}/../lib/tools.jar")
+  }
+
   useJUnit {}
   include "**/*Test.class"
   scanForTestClasses false

gradle.properties

@@ -1,12 +1,15 @@
 # Available idea versions:
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
-version=2020.1-snapshot
 
-ideaVersion=2020.1.1
-javaVersion=1.8
-kotlinVersion=1.3.72
-kotlinApiVersion=1.3
+pluginVersion=2020.3-SNAPSHOT
+ideaVersion=203-EAP-SNAPSHOT
+ijpVersion=0.6.1
+javaVersion=11
+kotlinVersion=1.4.10
+kotlinApiVersion=1.4
+clojureVersion=1.10.2-alpha3
+cljsVersion=1.10.773
 
 artifactsPath=build/artifacts
 org.gradle.jvmargs=-Xmx384m -Dfile.encoding=utf-8

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

resources/META-INF/plugin.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <idea-plugin>
   <id>org.jetbrains.idea.clojure</id>
-  <version>2020.1-snapshot</version>
+  <version>2020.3-SNAPSHOT</version>
   <vendor email="[email protected]">Greg Shrago</vendor>
-  <idea-version since-build="201.6668"/>
+  <idea-version since-build="203.5419"/>
 
   <name>Clojure-Kit</name>
   <description>Clojure and ClojureScript plugin for IntelliJ-based tools</description>
@@ -15,9 +15,7 @@
   <change-notes>
     <![CDATA[
     <ul>
-      <li>formatter: missing newline after a line comment (#31)</li>
-      <li>resolve: nested vectors in `require` (#33)</li>
-      <li>platform: IntelliJ IDEA 2020.1</li>
+      <li>platform: IntelliJ IDEA 2020.3</li>
     </ul>
     <a href="https://github.com/gregsh/Clojure-Kit/blob/master/CHANGELOG.md">Full change log...</a>
     ]]>