diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8d5d62d981..d6bb1e9f2a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -79,7 +79,7 @@ wire {
}
ktlint {
- version.set("0.49.1")
+ version.set("1.2.1")
}
android {
diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts
index 1863b1ca87..8b755295e5 100644
--- a/build-logic/plugins/build.gradle.kts
+++ b/build-logic/plugins/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.kotlin.dsl.extra
plugins {
`kotlin-dsl`
id("groovy-gradle-plugin")
- id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
+ id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
}
val signalJavaVersion: JavaVersion by rootProject.extra
diff --git a/build-logic/plugins/src/main/java/ktlint.gradle.kts b/build-logic/plugins/src/main/java/ktlint.gradle.kts
index 13ffed8d5e..a0d7ee7757 100644
--- a/build-logic/plugins/src/main/java/ktlint.gradle.kts
+++ b/build-logic/plugins/src/main/java/ktlint.gradle.kts
@@ -3,5 +3,5 @@ plugins {
}
ktlint {
- version.set("0.49.1")
+ version.set("1.2.1")
}
diff --git a/build-logic/tools/build.gradle.kts b/build-logic/tools/build.gradle.kts
index ba85911049..d9893413b4 100644
--- a/build-logic/tools/build.gradle.kts
+++ b/build-logic/tools/build.gradle.kts
@@ -1,7 +1,7 @@
plugins {
id("org.jetbrains.kotlin.jvm")
id("java-library")
- id("org.jlleitschuh.gradle.ktlint") version "11.4.2"
+ id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
}
val signalJavaVersion: JavaVersion by rootProject.extra
@@ -14,7 +14,7 @@ java {
// NOTE: For now, in order to run ktlint on this project, you have to manually run ./gradlew :build-logic:tools:ktlintFormat
// Gotta figure out how to get it auto-included in the normal ./gradlew ktlintFormat
ktlint {
- version.set("0.49.1")
+ version.set("1.2.1")
}
dependencies {
diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
index 10dcad6d08..081632e05a 100644
--- a/dependencies.gradle.kts
+++ b/dependencies.gradle.kts
@@ -45,7 +45,7 @@ dependencyResolutionManagement {
library("kotlin-stdlib-jdk8", "org.jetbrains.kotlin", "kotlin-stdlib-jdk8").versionRef("kotlin")
library("kotlin-reflect", "org.jetbrains.kotlin", "kotlin-reflect").versionRef("kotlin")
library("kotlin-gradle-plugin", "org.jetbrains.kotlin", "kotlin-gradle-plugin").versionRef("kotlin")
- library("ktlint", "org.jlleitschuh.gradle:ktlint-gradle:11.4.2")
+ library("ktlint", "org.jlleitschuh.gradle:ktlint-gradle:12.1.1")
library("kotlinx-coroutines-play-services", "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.1")
// Android X
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 057f3623d2..4578274187 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -2081,6 +2081,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
@@ -2091,6 +2096,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
@@ -2776,6 +2786,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
@@ -3426,6 +3446,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3434,6 +3470,150 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3442,6 +3622,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3474,6 +3670,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3650,6 +3862,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3658,6 +3886,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3698,6 +3942,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4038,6 +4298,32 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4058,6 +4344,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
@@ -4095,6 +4386,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4111,6 +4415,27 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4822,6 +5147,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
@@ -4852,6 +5187,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
@@ -4980,6 +5325,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
@@ -5050,6 +5405,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
@@ -5061,6 +5421,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -5111,11 +5479,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
@@ -5141,6 +5519,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
@@ -5151,6 +5534,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
@@ -5176,6 +5569,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
@@ -5186,6 +5584,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
+
+
@@ -5433,6 +5841,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -5818,6 +6234,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
diff --git a/libsignal-service/build.gradle.kts b/libsignal-service/build.gradle.kts
index 8ef56c93a8..fb5370fd9c 100644
--- a/libsignal-service/build.gradle.kts
+++ b/libsignal-service/build.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
@@ -43,7 +48,7 @@ afterEvaluate {
}
ktlint {
- version.set("0.49.1")
+ version.set("1.2.1")
filter {
exclude { entry ->