From 50e314d5dcb5b3fe9ba422e9f5c6b18722c2f2a2 Mon Sep 17 00:00:00 2001
From: Maksym Moroz <maksymmoroz@duck.com>
Date: Sun, 28 Jan 2024 23:01:54 +0200
Subject: [PATCH] Register gradle tasks instead of creating eagerly.

Signed-off-by: Maksym Moroz <maksymmoroz@duck.com>

Resolves #13391
---
 build.gradle.kts        | 12 ++++++------
 dependencies.gradle.kts |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 72cb04c48da..a7836172e47 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -40,7 +40,7 @@ tasks.withType<Wrapper> {
 apply(from = "${rootDir}/constants.gradle.kts")
 
 subprojects {
-  if (JavaVersion.current().isJava8Compatible()) {
+  if (JavaVersion.current().isJava8Compatible) {
     allprojects {
       tasks.withType<Javadoc> {
         (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
@@ -50,8 +50,8 @@ subprojects {
 
   val skipQa = setOf("Signal-Android", "libsignal-service", "lintchecks", "benchmark", "core-util-jvm", "logging")
 
-  if (!skipQa.contains(project.name) && !project.name.endsWith("-app")) {
-    task("qa") {
+  if (project.name !in skipQa && !project.name.endsWith("-app")) {
+    tasks.register("qa") {
       group = "Verification"
       description = "Quality Assurance. Run before pushing"
       dependsOn("clean", "testReleaseUnitTest", "lintRelease")
@@ -59,7 +59,7 @@ subprojects {
   }
 }
 
-task("buildQa") {
+tasks.register("buildQa") {
   group = "Verification"
   description = "Quality Assurance for build logic."
   dependsOn(
@@ -69,7 +69,7 @@ task("buildQa") {
   )
 }
 
-task("qa") {
+tasks.register("qa") {
   group = "Verification"
   description = "Quality Assurance. Run before pushing."
   dependsOn(
@@ -92,7 +92,7 @@ tasks.register("clean", Delete::class) {
   delete(rootProject.buildDir)
 }
 
-task("format") {
+tasks.register("format") {
   group = "Formatting"
   description = "Runs the ktlint formatter on all sources in this project and included builds"
   dependsOn(
diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
index 7b21c767a58..4381b78e0fe 100644
--- a/dependencies.gradle.kts
+++ b/dependencies.gradle.kts
@@ -153,7 +153,6 @@ dependencyResolutionManagement {
 
       // Can"t use the newest version because it hits some weird NoClassDefFoundException
       library("jknack-handlebars", "com.github.jknack:handlebars:4.0.7")
-      library("kotlinx-collections-immutable", "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
 
       // Mp4Parser
       library("mp4parser-isoparser", "org.mp4parser", "isoparser").versionRef("mp4parser")