From bf2d8c3f4bcd7b263e6708014e29b5656c47b09f Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Wed, 31 Mar 2021 20:50:13 +0200 Subject: [PATCH] update kotlin plugin to 1.4.32 --- compiler/build.gradle | 10 ++-------- compiler/res/version.txt | 2 +- compilerAst/build.gradle | 2 +- dbusCompilerService/build.gradle | 4 ++-- httpCompilerService/build.gradle | 4 ++-- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/compiler/build.gradle b/compiler/build.gradle index 400b70857..0b3a9c1d5 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -1,8 +1,7 @@ plugins { id 'java' id 'application' - id "org.jetbrains.kotlin.jvm" version "1.4.30" - id 'org.jetbrains.dokka' version "0.9.18" + id "org.jetbrains.kotlin.jvm" version "1.4.32" id 'com.github.johnrengelman.shadow' version '6.1.0' } @@ -21,7 +20,7 @@ dependencies { implementation project(':compilerAst') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" - implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.1' + implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.2' // implementation 'net.razorvine:ksim65:1.8' // implementation "com.github.hypfvieh:dbus-java:3.2.4" @@ -97,11 +96,6 @@ test { } -dokka { - outputFormat = 'html' - outputDirectory = "$buildDir/kdoc" -} - task wrapper(type: Wrapper) { gradleVersion = '6.7' } diff --git a/compiler/res/version.txt b/compiler/res/version.txt index c596943a9..912643200 100644 --- a/compiler/res/version.txt +++ b/compiler/res/version.txt @@ -1 +1 @@ -6.4 +6.5-SNAPSHOT diff --git a/compilerAst/build.gradle b/compilerAst/build.gradle index 419473614..821f91637 100644 --- a/compilerAst/build.gradle +++ b/compilerAst/build.gradle @@ -1,7 +1,7 @@ plugins { id 'antlr' id 'java' - id "org.jetbrains.kotlin.jvm" version "1.4.30" + id "org.jetbrains.kotlin.jvm" version "1.4.32" } targetCompatibility = 11 diff --git a/dbusCompilerService/build.gradle b/dbusCompilerService/build.gradle index e954f18d6..3719a1f50 100644 --- a/dbusCompilerService/build.gradle +++ b/dbusCompilerService/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'application' - id "org.jetbrains.kotlin.jvm" version "1.4.30" + id "org.jetbrains.kotlin.jvm" version "1.4.32" id 'com.github.johnrengelman.shadow' version '6.1.0' } @@ -18,7 +18,7 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" - implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.1' + implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.2' implementation "com.github.hypfvieh:dbus-java:3.2.4" implementation "org.slf4j:slf4j-simple:1.7.30" diff --git a/httpCompilerService/build.gradle b/httpCompilerService/build.gradle index 6db76994c..e67ecebe0 100644 --- a/httpCompilerService/build.gradle +++ b/httpCompilerService/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'application' - id "org.jetbrains.kotlin.jvm" version "1.4.30" + id "org.jetbrains.kotlin.jvm" version "1.4.32" id 'com.github.johnrengelman.shadow' version '6.1.0' } @@ -19,7 +19,7 @@ dependencies { implementation project(':compiler') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" - implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.1' + implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.2' implementation "org.takes:takes:1.19" implementation "javax.json:javax.json-api:1.1.4" implementation "org.glassfish:javax.json:1.1.4"