From e0a51d21f9fcb5f228d743323c16a98ffd72e844 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 24 Aug 2021 20:41:58 -0700 Subject: [PATCH] Revert "Fixed kapt daemon configuration for JDK < 16." This reverts commit 1db47a0b22bbc57175308bd5f32dc521b5deba4e. --- build.gradle | 32 +++++++++++++++----------------- version.properties | 6 +++--- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 48c77cd..fdee3ae 100644 --- a/build.gradle +++ b/build.gradle @@ -79,23 +79,21 @@ java { } kotlin { - if (JavaVersion.current() >= JavaVersion.VERSION_16) { - // Add kapt.use.worker.api=false to gradle.properties (JDK 16+) - // See: https://youtrack.jetbrains.com/issue/KT-45545 - kotlinDaemonJvmArgs = [ - "-Dfile.encoding=UTF-8", - "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", - "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" - ] - } + // Add kapt.use.worker.api=false to gradle.properties (JDK 16+) + // See: https://youtrack.jetbrains.com/issue/KT-45545 + kotlinDaemonJvmArgs = [ + "-Dfile.encoding=UTF-8", + "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" + ] } kapt { diff --git a/version.properties b/version.properties index 65f4e77..50f350f 100644 --- a/version.properties +++ b/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Tue Aug 24 19:02:49 PDT 2021 -version.buildmeta=1369 +#Tue Aug 24 11:34:08 PDT 2021 +version.buildmeta=1366 version.major=0 version.minor=8 version.patch=0 version.prerelease=beta version.project=mobibot -version.semver=0.8.0-beta+1369 +version.semver=0.8.0-beta+1366