Skip to content

Commit

Permalink
build: advance versions
Browse files Browse the repository at this point in the history
  • Loading branch information
gregsh committed Nov 26, 2019
1 parent 5689094 commit 820ed25
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

plugins {
id "org.jetbrains.intellij" version "0.4.10"
id "org.jetbrains.intellij" version "0.4.14"
}

version = "${version}"
Expand All @@ -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"
Expand Down Expand Up @@ -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")
}

Expand All @@ -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"
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 820ed25

Please sign in to comment.