Merge ~vpa1977/ubuntu/+source/kotlin:ubuntu/devel into ubuntu/+source/kotlin:ubuntu/devel

[Vladimir Petko]

Changes:
 - add patch to compile kotlin against Java 8 API
 - cherry-pick upstream patch to workaround Java 21 internal API changes

PPA: ppa:vpa1977/gettext [1]

Testing:
 - piuparts test (install/upgrade/purge) [2]
 - rebuild kotlin with Java 21 default [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext/+packages
[2] https://bugs.launchpad.net/ubuntu/+source/kotlin/+bug/2051757/comments/2
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/gettext-21/+sourcepub/15766367/+listing-archive-extra

[Dan Bungert (dbungert)]

already uploaded

diff --git a/debian/changelog b/debian/changelog
index 60beb90..555aba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kotlin (1.3.31+ds1-1ubuntu1) noble; urgency=medium
+
+  * Resolve Java 21 FTBFS (LP: #2051757):
+    - d/p/073-abstractlist.patch: add missing methods to the API due to
+      the update to source level 8.
+    - d/p/074-kapt3.patch: cherry-pick upstream patch to resolve Java 21
+      ftbfs due to the jdk.compiler changes.
+    - d/control: require updated libasm-java and libintellij-* packages
+      to support Java 21.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 31 Jan 2024 16:57:00 +1300
+
 kotlin (1.3.31+ds1-1build5) lunar; urgency=medium
 
   * Rebuild against newly bootstrapped kotlin.
diff --git a/debian/control b/debian/control
index cab9158..c423762 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: kotlin
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Samyak Jain <[e-mail]>,
  Sunil Mohan Adapa <[e-mail]>,
@@ -12,16 +13,16 @@ Build-Depends:
  gradle-debian-helper (>= 2.4~),
  jflex,
  kotlin,
- libasm-java,
+ libasm-java (>= 9.6~),
  libgradle-android-plugin-java,
  libguava-java,
- libintellij-core-java,
- libintellij-extensions-java,
+ libintellij-core-java (>= 183.5153.4-4ubuntu1~),
+ libintellij-extensions-java (>= 183.5153.4-4ubuntu1~),
  libintellij-java-compatibility-java,
- libintellij-jps-model-java,
- libintellij-platform-api-java,
- libintellij-platform-impl-java,
- libintellij-utils-java,
+ libintellij-jps-model-java (>= 183.5153.4-4ubuntu1~),
+ libintellij-platform-api-java (>= 183.5153.4-4ubuntu1~),
+ libintellij-platform-impl-java (>= 183.5153.4-4ubuntu1~),
+ libintellij-utils-java (>= 183.5153.4-4ubuntu1~),
  libjarjar-java,
  libjdom2-intellij-java,
  libjdom2-java,
diff --git a/debian/patches/073-abstractlist.patch b/debian/patches/073-abstractlist.patch
new file mode 100644
index 0000000..da9399d
--- /dev/null
+++ b/debian/patches/073-abstractlist.patch
@@ -0,0 +1,33 @@
+Description: 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.
+Author: Vladimir Petko <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057513
+Forwarded: not-needed
+Last-Update: 2024-01-24
+--- a/libraries/stdlib/src/kotlin/collections/AbstractList.kt
++++ b/libraries/stdlib/src/kotlin/collections/AbstractList.kt
+@@ -21,6 +21,9 @@
+     abstract override val size: Int
+     abstract override fun get(index: Int): E
+ 
++    override fun toArray(): Array<Any?> = super<AbstractCollection>.toArray()
++    override fun <T : Any?> toArray(p0: Array<T>): Array<T> = super<AbstractCollection>.toArray<T>(p0)
++
+     override fun iterator(): Iterator<E> = IteratorImpl()
+ 
+     override fun indexOf(element: @UnsafeVariance E): Int = indexOfFirst { it == element }
+--- a/libraries/stdlib/src/kotlin/collections/Collections.kt
++++ b/libraries/stdlib/src/kotlin/collections/Collections.kt
+@@ -47,6 +47,9 @@
+         throw IndexOutOfBoundsException("fromIndex: $fromIndex, toIndex: $toIndex")
+     }
+ 
++    fun toArray(): Array<Any?> = arrayOf<Any?>()
++    fun <T : Any?> toArray(p0: Array<T>): Array<T> = p0
++
+     private fun readResolve(): Any = EmptyList
+ }
+ 
diff --git a/debian/patches/074-kapt3.patch b/debian/patches/074-kapt3.patch
new file mode 100644
index 0000000..702bb03
--- /dev/null
+++ b/debian/patches/074-kapt3.patch
@@ -0,0 +1,74 @@
+Description: KAPT: Use reflection to access code, changed in JDK 21
+ Related JDK change: https://github.com/openjdk/jdk/commit/a917fb3fcf0fe1a4c4de86c08ae4041462848b82
+Author: Ilmir Usmanov <[e-mail]>
+Origin: upstream, https://github.com/JetBrains/kotlin/commit/37417f791950bb5fe484edfa8894f26e113fca27
+Bug: https://youtrack.jetbrains.com/issue/KT-57389
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057513
+Forwarded: not-needed
+Applied-Upstream: 37417f791950bb5fe484edfa8894f26e113fca27
+--- a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/javac/KaptJavaLog.kt
++++ b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/javac/KaptJavaLog.kt
+@@ -7,6 +7,7 @@
+ package org.jetbrains.kotlin.kapt3.base.javac
+ 
+ import com.sun.tools.javac.tree.JCTree
++import com.sun.tools.javac.tree.JCTree.JCImport
+ import com.sun.tools.javac.util.*
+ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType
+ import org.jetbrains.kotlin.kapt3.base.KaptContext
+@@ -54,6 +55,8 @@
+ 
+     private val _reportedDiagnostics = mutableListOf<JCDiagnostic>()
+ 
++    private val jcImportQualidField = JCImport::class.java.declaredFields.single { it.name == "qualid" }
++
+     override fun flush(kind: WriterKind?) {
+         super.flush(kind)
+ 
+@@ -196,7 +199,7 @@
+         val visitor = object : JCTree.Visitor() {
+             override fun visitImport(that: JCTree.JCImport) {
+                 super.visitImport(that)
+-                if (!found) that.qualid.accept(this)
++                if (!found) (jcImportQualidField.get(that) as JCTree).accept(this)
+             }
+ 
+             override fun visitSelect(that: JCTree.JCFieldAccess) {
+--- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
++++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
+@@ -121,6 +121,8 @@
+ 
+     private var done = false
+ 
++    private val treeMakerImportMethod = TreeMaker::class.java.declaredMethods.single { it.name == "Import" }
++
+     fun convert(): List<KaptStub> {
+         if (done) error(ClassFileToSourceStubConverter::class.java.simpleName + " can convert classes only once")
+         done = true
+@@ -188,7 +190,7 @@
+ 
+         val nonEmptyImports: JavacList<JCTree> = when {
+             imports.size > 0 -> imports
+-            else -> JavacList.of(treeMaker.Import(treeMaker.FqName("java.lang.System"), false))
++            else -> JavacList.of(treeMakerImportMethod.invoke(treeMaker, treeMaker.FqName("java.lang.System"), false) as JCImport)
+         }
+ 
+         val classes = JavacList.of<JCTree>(classDeclaration)
+@@ -275,13 +277,15 @@
+             val importedExpr = treeMaker.FqName(importedFqName.asString())
+ 
+             imports += if (importDirective.isAllUnder) {
+-                treeMaker.Import(treeMaker.Select(importedExpr, treeMaker.nameTable.names.asterisk), false)
++                treeMakerImportMethod.invoke(
++                    treeMaker, treeMaker.Select(importedExpr, treeMaker.nameTable.names.asterisk), false
++                ) as JCImport
+             } else {
+                 if (!importedShortNames.add(importedFqName.shortName().asString())) {
+                     continue
+                 }
+ 
+-                treeMaker.Import(importedExpr, false)
++                treeMakerImportMethod.invoke(treeMaker, importedExpr, false) as JCImport
+             }
+         }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5306239..1216fa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -65,3 +65,5 @@
 070-replace-proguard-with-jarjar.patch
 071-java8-compatibility.patch
 072-tty-detection-fallback.patch
+073-abstractlist.patch
+074-kapt3.patch