plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/incremental/classStructureCache.kt | 15 13 + 2 - 0 !
1 file changed, 13 insertions(+), 2 deletions(-)

 [patch] kt-33889: do not use private non-api methods from
 JavacProcessingEnvironment
Bug: https://youtrack.jetbrains.com/issue/KT-33889

plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptContext.kt | 31 21 + 10 - 0 !
plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/javac/KaptJavaLog.kt | 27 18 + 9 - 0 !
plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/javac/KaptJavaLog17.kt | 211 211 + 0 - 0 !
plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/util/WriterBackedKaptLogger.kt | 2 1 + 1 - 0 !
plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/util/java9Utils.kt | 7 6 + 1 - 0 !
plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt | 4 2 + 2 - 0 !
6 files changed, 259 insertions(+), 23 deletions(-)

 [patch] [kapt] add experimental jdk 17 support
Bug: https://youtrack.jetbrains.com/issue/KT-47583

plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/annotationProcessing.kt | 6 4 + 2 - 0 !
plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/javac/KaptJavaLog.kt | 8 4 + 4 - 0 !
plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/util/java9Utils.kt | 5 3 + 2 - 0 !
3 files changed, 11 insertions(+), 8 deletions(-)

 use reflection to call pre jdk9 methods.
 This is required to build with JDK 9 or later

compiler/cli/build.gradle | 3 1 + 2 - 0 !
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 3 1 + 2 - 0 !
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 6 1 + 5 - 0 !
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt | 15 1 + 14 - 0 !
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt | 6 0 + 6 - 0 !
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacLogger.kt | 2 1 + 1 - 0 !
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperKotlinResolverImpl.kt | 61 0 + 61 - 0 !
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperRegistrar.kt | 71 0 + 71 - 0 !
8 files changed, 5 insertions(+), 162 deletions(-)

 disables the javac wrapper to be able to build with java 17
 As of Kotlin 1.8.0 the wrapper, which is triggered by the -Xuse-javac
 compiler option, is still not compatible with the JDK 17 classes.

libraries/reflect/build.gradle | 17 8 + 9 - 0 !
1 file changed, 8 insertions(+), 9 deletions(-)

 replaces proguard with jarjar to assemble the kotlin-reflect jar.
 Proguard 6 is unable to parse the classes of OpenJDK 17, and it looks like
 Kotlin classes are evicted even if minimization is disabled, which breaks the build.
 To be retried with Proguard 7.

core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt | 2 1 + 1 - 0 !
libraries/stdlib/common/src/generated/_Strings.kt | 34 17 + 17 - 0 !
2 files changed, 18 insertions(+), 18 deletions(-)

 fixes the backward compatibility when running with java 8
 When building with Java 17 the CharSequence.isEmpty() method is used instead of
 the extension method added to the CharSequence class by Kotlin. This causes
 NoSuchMethodErrors at runtime when Kotlin is used with Java 8.

compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PlainTextMessageRenderer.java | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fall back to another tty detection method if jansi clibrary isn't available

libraries/stdlib/src/kotlin/collections/AbstractList.kt | 3 3 + 0 - 0 !
libraries/stdlib/src/kotlin/collections/Collections.kt | 3 3 + 0 - 0 !
2 files changed, 6 insertions(+)

 provide overrides for methods introduced in java 8 api
 Java 21 sets minimum release level to Java 8, forcing Java 8 API compatibility.
 This patch adds toArray() methods required by the new interface signatures.
 This patch introduces API incompatibility (extra methods).
 Upstream builds with Java 6/7 and does not need this patch.

plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/javac/KaptJavaLog.kt | 5 4 + 1 - 0 !
plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt | 10 7 + 3 - 0 !
2 files changed, 11 insertions(+), 4 deletions(-)

 kapt: use reflection to access code, changed in jdk 21
 Related JDK change: https://github.com/openjdk/jdk/commit/a917fb3fcf0fe1a4c4de86c08ae4041462848b82

compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt | 2 2 + 0 - 0 !
compiler/frontend/src/org/jetbrains/kotlin/util/javaslang/javaslangAdapters.kt | 1 1 + 0 - 0 !
compiler/tests-java8/tests/org/jetbrains/kotlin/serialization/builtins/AdditionalBuiltInsMembersSignatureListsTest.kt | 13 12 + 1 - 0 !
core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/jvm/JvmBuiltInsSettings.kt | 20 18 + 2 - 0 !
libraries/stdlib/jdk8/src/kotlin/streams/Streams.kt | 1 1 + 0 - 0 !
libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt | 2 1 + 1 - 0 !
libraries/stdlib/jvm/src/kotlin/util/Exceptions.kt | 3 2 + 1 - 0 !
libraries/stdlib/src/kotlin/comparisons/Comparisons.kt | 1 1 + 0 - 0 !
libraries/stdlib/src/kotlin/text/Strings.kt | 1 1 + 0 - 0 !
9 files changed, 39 insertions(+), 5 deletions(-)

 fix compiler run-time compatibility with legacy jdks

build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt | 4 3 + 1 - 0 !
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt | 3 2 + 1 - 0 !
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt | 8 7 + 1 - 0 !
idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java | 8 5 + 3 - 0 !
jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt | 15 11 + 4 - 0 !
libraries/scripting/jvm/build.gradle | 6 6 + 0 - 0 !
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinNativeToolRunner.kt | 3 2 + 1 - 0 !
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt | 9 5 + 4 - 0 !
libraries/tools/kotlin-main-kts/src/org/jetbrains/kotlin/mainKts/impl/ivy.kt | 3 2 + 1 - 0 !
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java | 21 11 + 10 - 0 !
10 files changed, 54 insertions(+), 26 deletions(-)

 fix cve-2020-29582