From 89b918fbd2c883777f5c6f1b5a43d42ba4a7c538 Mon Sep 17 00:00:00 2001 From: Rashad Sookram Date: Wed, 12 Jan 2022 12:04:07 -0500 Subject: [PATCH] Update ktlint-gradle. --- app/build.gradle | 5 + .../database/LocalMetricsDatabase.kt | 3 +- .../securesms/database/LogDatabase.kt | 3 +- .../voice/VoiceNotePlaybackControllerTest.kt | 2 +- .../storage/TextSecureIdentityKeyStoreTest.kt | 2 +- build.gradle | 2 +- gradle/verification-metadata.xml | 202 +++++++++++++----- 7 files changed, 158 insertions(+), 61 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 57c6c419b..d794c4bda 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,6 +57,11 @@ protobuf { } } +ktlint { + // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507 + version = "0.43.2" +} + def canonicalVersionCode = 985 def canonicalVersionName = "5.29.1" diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt index 99eace576..63941e9ce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt @@ -26,7 +26,8 @@ import java.util.concurrent.TimeUnit class LocalMetricsDatabase private constructor( application: Application, databaseSecret: DatabaseSecret -) : SQLiteOpenHelper( +) : + SQLiteOpenHelper( application, DATABASE_NAME, databaseSecret.asString(), diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt index 399547aef..60821caba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt @@ -28,7 +28,8 @@ import java.util.concurrent.TimeUnit class LogDatabase private constructor( application: Application, databaseSecret: DatabaseSecret -) : SQLiteOpenHelper( +) : + SQLiteOpenHelper( application, DATABASE_NAME, databaseSecret.asString(), diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackControllerTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackControllerTest.kt index 52564a594..53f7f6930 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackControllerTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackControllerTest.kt @@ -11,11 +11,11 @@ import com.google.android.exoplayer2.audio.AudioAttributes import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito -import org.mockito.Mockito.`when` import org.mockito.Mockito.any import org.mockito.Mockito.anyBoolean import org.mockito.Mockito.mock import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config diff --git a/app/src/test/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStoreTest.kt b/app/src/test/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStoreTest.kt index a4517ce74..794d3669c 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStoreTest.kt +++ b/app/src/test/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStoreTest.kt @@ -4,10 +4,10 @@ import android.content.Context import junit.framework.Assert.assertEquals import org.junit.Before import org.junit.Test -import org.mockito.Mockito.`when` import org.mockito.Mockito.mock import org.mockito.Mockito.times import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` import org.thoughtcrime.securesms.database.IdentityDatabase import org.thoughtcrime.securesms.database.model.IdentityStoreRecord import org.whispersystems.libsignal.IdentityKey diff --git a/build.gradle b/build.gradle index 392f5be51..26cd29e8e 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ buildscript { classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0" + classpath "org.jlleitschuh.gradle:ktlint-gradle:10.2.1" classpath 'app.cash.exhaustive:exhaustive-gradle:0.1.1' } } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 528648571..817ab4c21 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1786,12 +1786,12 @@ - - - + + + @@ -1886,84 +1886,92 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + @@ -2177,6 +2185,14 @@ + + + + + + + + @@ -2688,6 +2704,11 @@ + + + + + @@ -2803,6 +2824,11 @@ + + + + + @@ -2823,6 +2849,11 @@ + + + + + @@ -2873,6 +2904,11 @@ + + + + + @@ -2883,6 +2919,11 @@ + + + + + @@ -2933,6 +2974,11 @@ + + + + + @@ -2963,6 +3009,11 @@ + + + + + @@ -2983,6 +3034,11 @@ + + + + + @@ -3003,6 +3059,11 @@ + + + + + @@ -3052,14 +3113,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + +