empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Move common gradle config into convention plugins.

Browse source
This commit is contained in:
Greyson Parrelli 2023-02-13 17:03:08 -05:00
parent 9fa4741e49
commit 6145fa213e
67 changed files with 684 additions and 786 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
app/build.gradle
View file

@ -1,39 +1,21 @@
import com.android.build.api.dsl.ManagedVirtualDevice
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'com.google.protobuf'
apply plugin: 'androidx.navigation.safeargs'
apply plugin: 'org.jlleitschuh.gradle.ktlint'
apply from: 'translations.gradle'
apply plugin: 'org.jetbrains.kotlin.android'
apply plugin: 'app.cash.exhaustive'
apply plugin: 'kotlin-parcelize'
apply plugin: 'com.squareup.wire'
apply from: 'static-ips.gradle'
repositories {
maven {
url "https://raw.githubusercontent.com/signalapp/maven/master/sqlcipher/release/"
content {
includeGroupByRegex "org\\.signal.*"
}
}
google()
mavenCentral()
mavenLocal()
maven {
url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
}
jcenter {
content {
includeVersion "mobi.upod", "time-duration-picker", "1.1.3"
}
}
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'com.google.protobuf'
id 'androidx.navigation.safeargs'
id 'org.jlleitschuh.gradle.ktlint'
id 'org.jetbrains.kotlin.android'
id 'app.cash.exhaustive'
id 'kotlin-parcelize'
id 'com.squareup.wire'
id 'android-constants'
}
apply from: 'translations.gradle'
apply from: 'static-ips.gradle'
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.18.0'
@ -102,8 +84,8 @@ def selectableVariants = [
android {
namespace 'org.thoughtcrime.securesms'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
buildToolsVersion BUILD_TOOLS_VERSION
compileSdkVersion COMPILE_SDK_VERSION
flavorDimensions 'distribution', 'environment'
useLibrary 'org.apache.http.legacy'
@ -180,8 +162,8 @@ android {
versionCode canonicalVersionCode * postFixSize
versionName canonicalVersionName
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
minSdkVersion MIN_SDK_VERSION
targetSdkVersion TARGET_SDK_VERSION
multiDexEnabled true

1
app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt
View file

@ -13,7 +13,6 @@ import androidx.fragment.app.commit
import com.google.android.material.shape.ShapeAppearanceModel
import com.google.android.material.transition.platform.MaterialContainerTransform
import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.PassphraseRequiredActivity
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController

8
build-logic/plugins/build.gradle Normal file
View file

@ -0,0 +1,8 @@
plugins {
id "groovy-gradle-plugin"
}
dependencies {
implementation libs.android.library
implementation libs.android.application
}

9
build-logic/plugins/src/main/java/android-constants.gradle Normal file
View file

@ -0,0 +1,9 @@
ext {
BUILD_TOOLS_VERSION = '32.0.0'
COMPILE_SDK_VERSION = 33
TARGET_SDK_VERSION = 31
MIN_SDK_VERSION = 21
JAVA_VERSION = JavaVersion.VERSION_1_8
}

31
signalModule.gradle → build-logic/plugins/src/main/java/signal-library.gradle
View file

@ -1,14 +1,17 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'org.jlleitschuh.gradle.ktlint'
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'org.jlleitschuh.gradle.ktlint'
id 'android-constants'
}
android {
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
buildToolsVersion BUILD_TOOLS_VERSION
compileSdkVersion COMPILE_SDK_VERSION
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
minSdkVersion MIN_SDK_VERSION
targetSdkVersion TARGET_SDK_VERSION
multiDexEnabled true
}
@ -35,15 +38,25 @@ ktlint {
dependencies {
lintChecks project(':lintchecks')
implementation project(':core-util')
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.core.ktx
implementation libs.androidx.fragment.ktx
implementation libs.androidx.annotation
implementation libs.androidx.appcompat
implementation libs.rxjava3.rxandroid
implementation libs.rxjava3.rxjava
implementation libs.rxjava3.rxkotlin
implementation libs.androidx.multidex
implementation libs.kotlin.stdlib.jdk8
ktlintRuleset libs.ktlint.twitter.compose
testImplementation testLibs.junit.junit
testImplementation testLibs.mockito.core
testImplementation testLibs.mockito.android
testImplementation testLibs.mockito.kotlin
testImplementation testLibs.robolectric.robolectric
testImplementation testLibs.androidx.test.core
testImplementation testLibs.androidx.test.core.ktx
}

65
build-logic/plugins/src/main/java/signal-sample-app.gradle Normal file
View file

@ -0,0 +1,65 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jlleitschuh.gradle.ktlint'
id 'android-constants'
}
android {
buildToolsVersion BUILD_TOOLS_VERSION
compileSdkVersion COMPILE_SDK_VERSION
defaultConfig {
versionCode 1
versionName "1.0"
minSdkVersion MIN_SDK_VERSION
targetSdkVersion TARGET_SDK_VERSION
multiDexEnabled true
}
kotlinOptions {
jvmTarget = '1.8'
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
}
ktlint {
// Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
version = "0.47.1"
}
dependencies {
coreLibraryDesugaring libs.android.tools.desugar
implementation project(':core-util')
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.core.ktx
implementation libs.androidx.fragment.ktx
implementation libs.androidx.annotation
implementation libs.androidx.appcompat
implementation libs.rxjava3.rxandroid
implementation libs.rxjava3.rxjava
implementation libs.rxjava3.rxkotlin
implementation libs.androidx.multidex
implementation libs.material.material
implementation libs.androidx.constraintlayout
implementation libs.kotlin.stdlib.jdk8
ktlintRuleset libs.ktlint.twitter.compose
testImplementation testLibs.junit.junit
testImplementation testLibs.mockito.core
testImplementation testLibs.mockito.android
testImplementation testLibs.mockito.kotlin
testImplementation testLibs.robolectric.robolectric
testImplementation testLibs.androidx.test.core
testImplementation testLibs.androidx.test.core.ktx
}

22
build-logic/settings.gradle Normal file
View file

@ -0,0 +1,22 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
rootProject.name = "build-logic"
include ':plugins'
apply from: '../dependencies.gradle'

18
build.gradle
View file

@ -34,28 +34,10 @@ buildscript {
}
}
ext {
BUILD_TOOL_VERSION = '32.0.0'
COMPILE_SDK = 33
TARGET_SDK = 31
MINIMUM_SDK = 21
JAVA_VERSION = JavaVersion.VERSION_1_8
}
wrapper {
distributionType = Wrapper.DistributionType.ALL
}
allprojects {
repositories {
google()
mavenCentral()
mavenLocal()
}
}
subprojects {
ext.lib_signal_service_version_number = "2.15.3"
ext.lib_signal_service_group_info = "org.whispersystems"

38
contacts/app/build.gradle
View file

@ -1,51 +1,15 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jlleitschuh.gradle.ktlint'
id 'signal-sample-app'
}
android {
namespace 'org.signal.contactstest'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
applicationId "org.signal.contactstest"
versionCode 1
versionName "1.0"
minSdkVersion 21
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
kotlinOptions {
jvmTarget = '1.8'
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
}
ktlint {
// Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
version = "0.47.1"
}
dependencies {
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.activity.ktx
implementation libs.androidx.appcompat
implementation libs.material.material
implementation libs.androidx.constraintlayout
testImplementation testLibs.junit.junit
implementation project(':contacts')
implementation project(':core-util')
}

44
contacts/lib/build.gradle
View file

@ -1,51 +1,11 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'org.jlleitschuh.gradle.ktlint'
id 'signal-library'
}
android {
namespace 'org.signal.contacts'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
lintOptions {
disable 'InvalidVectorPath'
}
}
ktlint {
// Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
version = "0.47.1"
}
dependencies {
lintChecks project(':lintchecks')
implementation project(':core-util')
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.core.ktx
implementation libs.androidx.annotation
implementation libs.androidx.appcompat
api libs.rxjava3.rxjava
}
}

4
core-ui/build.gradle
View file

@ -1,4 +1,6 @@
apply from: "$rootProject.projectDir/signalModule.gradle"
plugins {
id 'signal-library'
}
android {
namespace 'org.signal.core.ui'

30
core-util/build.gradle
View file

@ -1,30 +1,11 @@
plugins {
id 'com.android.library'
id 'signal-library'
id 'com.google.protobuf'
id 'kotlin-android'
id 'kotlin-kapt'
}
android {
namespace 'org.signal.core.util'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
}
protobuf {
@ -43,17 +24,8 @@ protobuf {
}
dependencies {
lintChecks project(':lintchecks')
coreLibraryDesugaring libs.android.tools.desugar
api libs.androidx.annotation
implementation libs.androidx.core.ktx
implementation libs.androidx.lifecycle.common.java8
implementation libs.google.protobuf.javalite
implementation libs.androidx.sqlite
implementation libs.rxjava3.rxjava
testImplementation testLibs.junit.junit
testImplementation testLibs.mockito.core

2
core-util/src/main/java/org/signal/core/util/AsciiArt.kt
View file

@ -5,7 +5,7 @@ import kotlin.math.max
class AsciiArt {
private class Table (
private class Table(
private val columns: List<String>,
private val rows: List<List<String>>
) {

2
core-util/src/main/java/org/signal/core/util/DimensionUnitExtensions.kt
View file

@ -24,4 +24,4 @@ val Float.sp: Float get() = DimensionUnit.SP.toPixels(this)
* Converts the given Int SP value into Pixels
*/
@get:Px
val Int.sp: Int get() = this.toFloat().sp.toInt()
val Int.sp: Int get() = this.toFloat().sp.toInt()

3
core-util/src/main/java/org/signal/core/util/FontUtil.kt
View file

@ -7,7 +7,6 @@ import android.graphics.Paint
import android.graphics.PorterDuff
import kotlin.math.abs
object FontUtil {
private const val SAMPLE_EMOJI = "\uD83C\uDF0D" // 🌍
@ -37,4 +36,4 @@ object FontUtil {
return bitmap.getPixel(0, 0) != 0
}
}
}

2
core-util/src/main/java/org/signal/core/util/OptionalExtensions.kt
View file

@ -16,4 +16,4 @@ fun <E> Optional<E>.isAbsent(): Boolean {
fun <E : Any> E?.toOptional(): Optional<E> {
return Optional.ofNullable(this)
}
}

3
core-util/src/main/java/org/signal/core/util/Serializer.kt
View file

@ -25,5 +25,4 @@ object StringStringSerializer : StringSerializer<String?> {
override fun deserialize(data: String): String {
return data
}
}
}

4
core-util/src/main/java/org/signal/core/util/SqlUtil.kt
View file

@ -82,7 +82,7 @@ object SqlUtil {
@JvmStatic
fun getForeignKeyDependencies(db: SupportSQLiteDatabase, table: String): Set<String> {
return db.query("PRAGMA foreign_key_list($table)")
.readToSet{ cursor ->
.readToSet { cursor ->
cursor.requireNonNullString("table")
}
}
@ -393,4 +393,4 @@ object SqlUtil {
}
class Query(val where: String, val whereArgs: Array<String>)
}
}

2
core-util/src/main/java/org/signal/core/util/StringExtensions.kt
View file

@ -37,4 +37,4 @@ fun String.asListContains(item: String): Boolean {
*/
fun String.toSingleLine(): String {
return this.trimIndent().split("\n").joinToString(separator = " ")
}
}

5
core-util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt
View file

@ -21,13 +21,13 @@ class DeadlockDetector(private val handler: Handler, private val pollingInterval
var lastThreadDumpTime: Long = -1
fun start() {
Log.d(TAG, "Beginning deadlock monitoring.");
Log.d(TAG, "Beginning deadlock monitoring.")
running = true
handler.postDelayed(this::poll, pollingInterval)
}
fun stop() {
Log.d(TAG, "Ending deadlock monitoring.");
Log.d(TAG, "Ending deadlock monitoring.")
running = false
handler.removeCallbacksAndMessages(null)
}
@ -122,7 +122,6 @@ class DeadlockDetector(private val handler: Handler, private val pollingInterval
for (entry in blocked) {
stringBuilder.append("-- [${entry.key.id}] ${entry.key.name} | ${entry.key.state}\n")
val callerThrowable: Throwable? = TracedThreads.callerStackTraces[entry.key.id]
val stackTrace: Array<StackTraceElement> = if (callerThrowable != null) {
ExceptionUtil.joinStackTrace(entry.value, callerThrowable.stackTrace)

15
core-util/src/main/java/org/signal/core/util/concurrent/TracingExecutorService.kt
View file

@ -31,25 +31,28 @@ internal class TracingExecutorService(val wrapped: ExecutorService) : ExecutorSe
val queue: Queue<Runnable>
get() {
return if (wrapped is ThreadPoolExecutor)
return if (wrapped is ThreadPoolExecutor) {
wrapped.queue
else
} else {
LinkedBlockingQueue()
}
}
val activeCount: Int
get() {
return if (wrapped is ThreadPoolExecutor)
return if (wrapped is ThreadPoolExecutor) {
wrapped.activeCount
else
} else {
0
}
}
val maximumPoolSize: Int
get() {
return if (wrapped is ThreadPoolExecutor)
return if (wrapped is ThreadPoolExecutor) {
wrapped.maximumPoolSize
else
} else {
0
}
}
}

9
core-util/src/main/java/org/signal/core/util/concurrent/TracingUncaughtExceptionHandler.kt
View file

@ -5,12 +5,13 @@ import org.signal.core.util.ExceptionUtil
/**
* An uncaught exception handler that will combine a caller stack trace with the exception to print a more useful stack trace.
*/
internal class TracingUncaughtExceptionHandler (
val originalHandler: Thread.UncaughtExceptionHandler?,
private val callerStackTrace: Throwable) : Thread.UncaughtExceptionHandler {
internal class TracingUncaughtExceptionHandler(
val originalHandler: Thread.UncaughtExceptionHandler?,
private val callerStackTrace: Throwable
) : Thread.UncaughtExceptionHandler {
override fun uncaughtException(thread: Thread, exception: Throwable) {
val updated = ExceptionUtil.joinStackTrace(exception, callerStackTrace)
originalHandler?.uncaughtException(thread, updated)
}
}
}

2
core-util/src/main/java/org/signal/core/util/money/PlatformCurrencyUtil.kt
View file

@ -21,4 +21,4 @@ object PlatformCurrencyUtil {
fun getAvailableCurrencyCodes(): Set<String> {
return Currency.getAvailableCurrencies().map { it.currencyCode }.toSet()
}
}
}

2
core-util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt
View file

@ -32,7 +32,7 @@ class StringExtensions_asListContains(
arrayOf("a", "b", false),
arrayOf("a", "abc", false),
arrayOf("b", "a*", false),
arrayOf("b", "a*", false)
).toList()
}
}

2
core-util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt
View file

@ -51,4 +51,4 @@ class StringUtilTest_endsWith {
assertEquals(expected, result)
}
}
}

2
core-util/src/test/java/org/signal/core/util/StringUtilTest_replace.kt
View file

@ -48,4 +48,4 @@ class StringUtilTest_replace {
assertEquals(expected.toString(), result.toString())
}
}
}

2
core-util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt
View file

@ -51,4 +51,4 @@ class StringUtilTest_startsWith {
assertEquals(expected, result)
}
}
}

5
dependencies.gradle
View file

@ -14,6 +14,11 @@ dependencyResolutionManagement {
version('kotlin', '1.6.21')
version('libsignal-client', '0.22.0')
version('mp4parser', '1.9.39')
version('android-gradle-plugin', '7.4.1')
// Android Plugins
alias('android-library').to('com.android.library', 'com.android.library.gradle.plugin').versionRef('android-gradle-plugin')
alias('android-application').to('com.android.application', 'com.android.application.gradle.plugin').versionRef('android-gradle-plugin')
// Compose
alias('androidx-compose-bom').to('androidx.compose:compose-bom:2022.12.00')

37
device-transfer/app/build.gradle
View file

@ -1,18 +1,12 @@
apply plugin: 'com.android.application'
plugins {
id 'signal-sample-app'
}
android {
namespace 'org.signal.devicetransfer.app'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
applicationId "org.signal.devicetransfer.app"
versionCode 1
versionName "1.0"
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@ -20,33 +14,8 @@ android {
buildConfigField "String", "LIBSIGNAL_VERSION", "\"libsignal ${libs.versions.libsignal.client.get()}\""
}
compileOptions {
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
buildTypes {
debug {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'),
'proguard/proguard.cfg'
}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'),
'proguard/proguard.cfg'
}
}
}
dependencies {
implementation libs.androidx.appcompat
implementation libs.material.material
implementation libs.androidx.constraintlayout
testImplementation testLibs.junit.junit
implementation project(':device-transfer')
}

22
device-transfer/lib/build.gradle
View file

@ -1,34 +1,16 @@
apply plugin: 'com.android.library'
repositories {
mavenCentral()
plugins {
id 'signal-library'
}
android {
namespace 'org.signal.devicetransfer'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
}
compileOptions {
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
}
dependencies {
implementation libs.androidx.appcompat
implementation project(':core-util')
implementation libs.libsignal.android
api libs.greenrobot.eventbus
testImplementation testLibs.junit.junit
testImplementation testLibs.androidx.test.core
testImplementation (testLibs.robolectric.robolectric) {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}

28
donations/app/build.gradle
View file

@ -1,43 +1,17 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'signal-sample-app'
id 'kotlin-kapt'
}
android {
namespace 'org.signal.donations.app'
compileSdk COMPILE_SDK
defaultConfig {
applicationId "org.signal.donations.app"
versionCode 1
versionName "1.0"
multiDexEnabled true
minSdk MINIMUM_SDK
targetSdk TARGET_SDK
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
}
dependencies {
implementation libs.androidx.core.ktx
implementation libs.androidx.appcompat
implementation libs.material.material
implementation project(':donations')
implementation project(':core-util')
}

3
donations/app/src/main/java/org/signal/donations/app/TestUtil.kt
View file

@ -18,5 +18,4 @@ object TestUtil : GooglePayApi.Gateway {
"MASTERCARD",
"VISA"
)
}
}

38
donations/lib/build.gradle
View file

@ -1,59 +1,23 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'signal-library'
id 'kotlin-parcelize'
}
android {
namespace 'org.signal.donations'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
lintOptions {
disable 'InvalidVectorPath'
}
}
dependencies {
lintChecks project(':lintchecks')
implementation project(':core-util')
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.core.ktx
implementation libs.androidx.annotation
implementation libs.androidx.appcompat
implementation libs.kotlin.stdlib.jdk8
implementation libs.kotlin.reflect
implementation libs.jackson.module.kotlin
implementation libs.jackson.core
testImplementation testLibs.junit.junit
testImplementation testLibs.assertj.core
testImplementation (testLibs.robolectric.robolectric) {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}
api libs.google.play.services.wallet
api libs.square.okhttp3
api libs.rxjava3.rxjava
}

2
donations/lib/src/main/java/org/signal/donations/CreditCardPaymentSource.kt
View file

@ -12,4 +12,4 @@ class CreditCardPaymentSource(
override fun parameterize(): JSONObject = payload
override fun getTokenId(): String = parameterize().getString("id")
override fun email(): String? = null
}
}

2
donations/lib/src/main/java/org/signal/donations/GooglePayApi.kt
View file

@ -218,4 +218,4 @@ class GooglePayApi(
}
class GooglePayException(message: String?) : Exception(message)
}
}

2
donations/lib/src/main/java/org/signal/donations/GooglePayPaymentSource.kt
View file

@ -25,4 +25,4 @@ class GooglePayPaymentSource(private val paymentData: PaymentData) : StripeApi.P
null
}
}
}
}

2
donations/lib/src/main/java/org/signal/donations/ResponseFieldLogger.kt
View file

@ -24,4 +24,4 @@ internal object ResponseFieldLogger {
Log.w(TAG, "Failed to produce key map.", true)
}
}
}
}

19
donations/lib/src/main/java/org/signal/donations/StripeApi.kt
View file

@ -90,13 +90,15 @@ class StripeApi(
Single.just(CreatePaymentIntentResult.AmountIsTooSmall(price))
} else if (Validation.isAmountTooLarge(price)) {
Single.just(CreatePaymentIntentResult.AmountIsTooLarge(price))
} else if (!Validation.supportedCurrencyCodes.contains(price.currency.currencyCode.uppercase(Locale.ROOT))) {
Single.just<CreatePaymentIntentResult>(CreatePaymentIntentResult.CurrencyIsNotSupported(price.currency.currencyCode))
} else {
paymentIntentFetcher
.fetchPaymentIntent(price, level)
.map<CreatePaymentIntentResult> { CreatePaymentIntentResult.Success(it) }
}.subscribeOn(Schedulers.io())
if (!Validation.supportedCurrencyCodes.contains(price.currency.currencyCode.uppercase(Locale.ROOT))) {
Single.just<CreatePaymentIntentResult>(CreatePaymentIntentResult.CurrencyIsNotSupported(price.currency.currencyCode))
} else {
paymentIntentFetcher
.fetchPaymentIntent(price, level)
.map<CreatePaymentIntentResult> { CreatePaymentIntentResult.Success(it) }
}.subscribeOn(Schedulers.io())
}
}
/**
@ -231,7 +233,7 @@ class StripeApi(
val tokenId = paymentSource.getTokenId()
val parameters = mutableMapOf(
"card[token]" to tokenId,
"type" to "card",
"type" to "card"
)
return postForm("payment_methods", parameters)
@ -554,5 +556,4 @@ class StripeApi(
}
}
}
}
}

4
donations/lib/src/main/java/org/signal/donations/StripeIntentAccessor.kt
View file

@ -27,7 +27,7 @@ data class StripeIntentAccessor(
* noActionRequired is a safe default for when there was no 3DS required,
* in order to continue a reactive payment chain.
*/
val NO_ACTION_REQUIRED = StripeIntentAccessor(ObjectType.NONE,"", "")
val NO_ACTION_REQUIRED = StripeIntentAccessor(ObjectType.NONE, "", "")
private const val KEY_PAYMENT_INTENT = "payment_intent"
private const val KEY_PAYMENT_INTENT_CLIENT_SECRET = "payment_intent_client_secret"
@ -51,4 +51,4 @@ data class StripeIntentAccessor(
}
}
}
}
}

2
donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt
View file

@ -24,4 +24,4 @@ enum class StripeIntentStatus(private val code: String) {
@JsonCreator
fun fromCode(code: String): StripeIntentStatus = StripeIntentStatus.values().first { it.code == code }
}
}
}

2
donations/lib/src/main/java/org/signal/donations/json/StripePaymentIntent.kt
View file

@ -15,4 +15,4 @@ data class StripePaymentIntent @JsonCreator constructor(
@JsonProperty("client_secret") val clientSecret: String,
@JsonProperty("status") val status: StripeIntentStatus?,
@JsonProperty("payment_method") val paymentMethod: String?
)
)

2
donations/lib/src/main/java/org/signal/donations/json/StripeSetupIntent.kt
View file

@ -16,4 +16,4 @@ data class StripeSetupIntent @JsonCreator constructor(
@JsonProperty("status") val status: StripeIntentStatus,
@JsonProperty("payment_method") val paymentMethod: String?,
@JsonProperty("customer") val customer: String?
)
)

9
donations/lib/src/test/java/org/signal/donations/ResponseFieldLoggerTest.kt
View file

@ -32,7 +32,9 @@ class ResponseFieldLoggerTest {
@Test
fun `Given non-empty, when I logFields, then I expect no crash`() {
ResponseFieldLogger.logFields(ObjectMapper(), """
ResponseFieldLogger.logFields(
ObjectMapper(),
"""
{
"id": "asdf",
"client_secret": 12345,
@ -40,6 +42,7 @@ class ResponseFieldLoggerTest {
"a": "a"
}
}
""".trimIndent())
""".trimIndent()
)
}
}
}

2
donations/lib/src/test/java/org/signal/donations/StripeIntentAccessorTest.kt
View file

@ -36,4 +36,4 @@ class StripeIntentAccessorTest {
assertEquals(expected, result)
}
}
}

2
donations/lib/src/test/java/org/signal/donations/StripeSetupIntentTest.kt
View file

@ -67,4 +67,4 @@ class StripeSetupIntentTest {
assertEquals(intent.status, StripeIntentStatus.REQUIRES_PAYMENT_METHOD)
assertEquals(intent.customer, "cus_Fh6d95jDS2fVSL")
}
}
}

29
glide-config/build.gradle
View file

@ -1,40 +1,13 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'signal-library'
id 'kotlin-kapt'
}
android {
namespace 'org.signal.glide'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
}
dependencies {
lintChecks project(':lintchecks')
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.core.ktx
implementation libs.androidx.annotation
implementation libs.androidx.appcompat
implementation libs.glide.glide
kapt libs.glide.compiler
}

382
gradle/verification-metadata.xml
View file

@ -507,6 +507,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="9fa21e2030273ee3cb8c4701c341af8cf9359791a3b45b2bc0be07870c03b1c8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.databinding" name="databinding-common" version="7.4.1">
<artifact name="databinding-common-7.4.1.jar">
<sha256 value="9fa21e2030273ee3cb8c4701c341af8cf9359791a3b45b2bc0be07870c03b1c8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.databinding" name="databinding-compiler-common" version="7.2.2">
<artifact name="databinding-compiler-common-7.2.2.jar">
<sha256 value="e1d31640e73f06e529c8f03dc074e2da70496d3ac188d8cbc8fdb6036dd1f607" origin="Generated by Gradle"/>
@ -517,6 +522,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="1aef98ba7ab0bfca6532f70a4b6ee8ac1bf433865edc0a178bd9f15b7ca20cc9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.databinding" name="databinding-compiler-common" version="7.4.1">
<artifact name="databinding-compiler-common-7.4.1.jar">
<sha256 value="b9e4baee6a891856c92c53adbd30e7ff1a7fdbaf1a4a0bd87321798abc53056f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.databinding" name="viewbinding" version="7.2.2">
<artifact name="viewbinding-7.2.2.aar">
<sha256 value="84edc51571d02791e262b3acf9927a44b51c47de66ce6d8cd6d126311cb6784f" origin="Generated by Gradle"/>
@ -696,6 +706,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="7d4bc2961cd5bd399e3621d434f0c453dd6cadf891f917a946cc291abdda8f1a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.3.0">
<artifact name="lifecycle-common-java8-2.3.0.module">
<sha256 value="2de56435ecd68ba2d49ae48011c34b758304af0a8e7e09ad2e8edfd2fe349b9c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.5.1">
<artifact name="lifecycle-common-java8-2.5.1.jar">
<sha256 value="69e1a62e5752ca3f43fb1607f161379bbe88b64af89c1a543c126160adf7cc53" origin="Generated by Gradle"/>
@ -1338,6 +1353,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="1f25f3f9c5d706fd7bc133a45bf35511093197d540635a613d1aae11260e314a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android" name="signflinger" version="7.4.1">
<artifact name="signflinger-7.4.1.jar">
<sha256 value="1f25f3f9c5d706fd7bc133a45bf35511093197d540635a613d1aae11260e314a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android" name="zipflinger" version="7.2.2">
<artifact name="zipflinger-7.2.2.jar">
<sha256 value="07207f161e936cd972432d4a09f378836b701e49dc30162e9f51c41f8755d28c" origin="Generated by Gradle"/>
@ -1348,6 +1368,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="d82b239494dd262e65cd94b2edf96c9b5cf19c7afbfc84f2601749f50e15c765" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android" name="zipflinger" version="7.4.1">
<artifact name="zipflinger-7.4.1.jar">
<sha256 value="d82b239494dd262e65cd94b2edf96c9b5cf19c7afbfc84f2601749f50e15c765" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.databinding" name="baseLibrary" version="7.2.2">
<artifact name="baseLibrary-7.2.2.jar">
<sha256 value="b9900577d2219784492414d361303eee4b14971ae52e2d7a8bd67a33c1636f95" origin="Generated by Gradle"/>
@ -1358,6 +1383,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="530b2113317ff4d0f69ffdfb49387ba4b86aac169e1c77dff943405b79adcf8b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.databinding" name="baseLibrary" version="7.4.1">
<artifact name="baseLibrary-7.4.1.jar">
<sha256 value="530b2113317ff4d0f69ffdfb49387ba4b86aac169e1c77dff943405b79adcf8b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="annotations" version="30.2.2">
<artifact name="annotations-30.2.2.jar">
<sha256 value="630ab4c6f211fa1c0f5c884152cb6311360f1b796442196c287a658645a99645" origin="Generated by Gradle"/>
@ -1368,6 +1398,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="d4ba7dd6055a6f1fd6ddb6dcef4e2096c15908bc7dc6057cb2e06f3a0db949c7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="annotations" version="30.4.1">
<artifact name="annotations-30.4.1.jar">
<sha256 value="d4ba7dd6055a6f1fd6ddb6dcef4e2096c15908bc7dc6057cb2e06f3a0db949c7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="common" version="30.2.2">
<artifact name="common-30.2.2.jar">
<sha256 value="ba5774b1a04fc11e2dc363ed2e27013ed7cbeabe696d3bdaba36629c996d3d53" origin="Generated by Gradle"/>
@ -1378,6 +1413,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="35c13302e51838600f72947ec4bf32ca77ce1611b4aa1ea70811f7ecc0b2a883" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="common" version="30.4.1">
<artifact name="common-30.4.1.jar">
<sha256 value="ff1bc07e6f7c98995e27d76dcc26604a5c6e5aaf5f8f6602fee982ad9a4d064c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="desugar_jdk_libs" version="1.1.5">
<artifact name="desugar_jdk_libs-1.1.5.jar">
<sha256 value="52b390b038c5fd62b1ec697bdf5e236ac3286756667350e5466838edea9cb26e" origin="Generated by Gradle"/>
@ -1398,6 +1438,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="d946ad39a40b667c82da87724527815536de62d0db0e8ea333449fdb90509001" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="dvlib" version="30.4.1">
<artifact name="dvlib-30.4.1.jar">
<sha256 value="d946ad39a40b667c82da87724527815536de62d0db0e8ea333449fdb90509001" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="play-sdk-proto" version="30.4.0">
<artifact name="play-sdk-proto-30.4.0.jar">
<sha256 value="b2335dfa59355cbdde5e1b55dafe539801e7162441fdaf6bd59d7768a2842f4f" origin="Generated by Gradle"/>
@ -1418,6 +1463,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="6c39549d1887a2c7e08b73d66c0c4f103657b06471760fb65858c943756cc940" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="repository" version="30.4.1">
<artifact name="repository-30.4.1.jar">
<sha256 value="6c39549d1887a2c7e08b73d66c0c4f103657b06471760fb65858c943756cc940" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="sdk-common" version="30.2.2">
<artifact name="sdk-common-30.2.2.jar">
<sha256 value="f95c9e1c9f78d34e32629408646ebc4c7f3134242e9efa6baf16c13cb5bd43d3" origin="Generated by Gradle"/>
@ -1428,6 +1478,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="3c5517b9a65fd33c2a1caeab787306d4e3bb233713e7bb47bacddcd84db2ea0d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="sdk-common" version="30.4.1">
<artifact name="sdk-common-30.4.1.jar">
<sha256 value="3c5517b9a65fd33c2a1caeab787306d4e3bb233713e7bb47bacddcd84db2ea0d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="sdklib" version="30.2.2">
<artifact name="sdklib-30.2.2.jar">
<sha256 value="6a205529e07c7831d2b60bbfc56b82c0e354c8628f5a111bffb7c5f2b930a11c" origin="Generated by Gradle"/>
@ -1438,6 +1493,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="8778613653c57b429abef58b67f3ef0be16a0b018f8ea442298d78394f422a5f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="sdklib" version="30.4.1">
<artifact name="sdklib-30.4.1.jar">
<sha256 value="8778613653c57b429abef58b67f3ef0be16a0b018f8ea442298d78394f422a5f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.analytics-library" name="crash" version="30.2.2">
<artifact name="crash-30.2.2.jar">
<sha256 value="6da2ea2b538246846560d8bf1d32517040c297edefa0dcfdc22b4a9a954f31ed" origin="Generated by Gradle"/>
@ -1448,6 +1508,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="aa05293ff6efca0f1687cfaa2deb201984016320b8bd3636a7e51abbf90f2c5d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.analytics-library" name="crash" version="30.4.1">
<artifact name="crash-30.4.1.jar">
<sha256 value="aa05293ff6efca0f1687cfaa2deb201984016320b8bd3636a7e51abbf90f2c5d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.analytics-library" name="protos" version="30.2.2">
<artifact name="protos-30.2.2.jar">
<sha256 value="feb293a4d175a24ce7f98d7f783670d81dab61260cf9bbd3d748e94f95e38892" origin="Generated by Gradle"/>
@ -1458,6 +1523,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="ba0303b9592dcd3891b616063f3eb670485f1a0fd5ad212d92ded505843ea87c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.analytics-library" name="protos" version="30.4.1">
<artifact name="protos-30.4.1.jar">
<sha256 value="ba0303b9592dcd3891b616063f3eb670485f1a0fd5ad212d92ded505843ea87c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.analytics-library" name="shared" version="30.2.2">
<artifact name="shared-30.2.2.jar">
<sha256 value="2512bf78dc8969b0206841ce996369b5a72d490c42e5c8410c3a62b455b0929b" origin="Generated by Gradle"/>
@ -1468,6 +1538,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="4a133831501b95369e0e8b1e73b924f0b68c95e5adbce252a8eed781de65923b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.analytics-library" name="shared" version="30.4.1">
<artifact name="shared-30.4.1.jar">
<sha256 value="556ebcfec60be225254d03d19a7d75b707fdc45f71b440f68f48d640a59305d4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.analytics-library" name="tracker" version="30.2.2">
<artifact name="tracker-30.2.2.jar">
<sha256 value="3a961cd6b0c9445b47c18d0516b534bdf094f93151197896f480f8798697c729" origin="Generated by Gradle"/>
@ -1478,6 +1553,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="a62bcf8ad3816bdc276999e80c8edd52bdb1a20bfd571d8f5f7e91fce1c74545" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.analytics-library" name="tracker" version="30.4.1">
<artifact name="tracker-30.4.1.jar">
<sha256 value="a62bcf8ad3816bdc276999e80c8edd52bdb1a20bfd571d8f5f7e91fce1c74545" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="aapt2" version="7.2.2-7984345">
<artifact name="aapt2-7.2.2-7984345-linux.jar">
<sha256 value="04ab4ae5fee5c69d1875053800518bf77def8c4032910d5188aa43c1f737da82" origin="Generated by Gradle"/>
@ -1523,6 +1603,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="8da30b51df7319a1e8bb7bbc96ddc9b9ecd56a31ecbcc7149be4cda4d325c095" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="aapt2-proto" version="7.4.1-8841542">
<artifact name="aapt2-proto-7.4.1-8841542.jar">
<sha256 value="4c880287ca1b83e741ac141b8b71877f3909efe88f9de33e68112dd12921032a" origin="Generated by Gradle"/>
</artifact>
<artifact name="aapt2-proto-7.4.1-8841542.module">
<sha256 value="8f928b0a2e36c8b084c349258cfbbc75cf9a26ea03450b3eea6cec856e69813d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="aaptcompiler" version="7.2.2">
<artifact name="aaptcompiler-7.2.2.jar">
<sha256 value="2708b280d0022d208c36fde3fc314b532bc3c050cfb2e72f9d045907489b578a" origin="Generated by Gradle"/>
@ -1539,6 +1627,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="48206a2603dd518f79439f8e8770d87f0408d60b06b8c2763d122062ed2d76bb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="aaptcompiler" version="7.4.1">
<artifact name="aaptcompiler-7.4.1.jar">
<sha256 value="22543444f6620de8b6ae7d4106de4deaf8d87533a2e920031e53417a4b2ff119" origin="Generated by Gradle"/>
</artifact>
<artifact name="aaptcompiler-7.4.1.module">
<sha256 value="7bbe39f755b5e2850214ebb8201bedef953b6a5a6c5a9805363ee955ee9da258" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="apksig" version="7.2.2">
<artifact name="apksig-7.2.2.jar">
<sha256 value="417be4b7bd7e94f0327377c42e40bced99325cae60834101019960275748a02f" origin="Generated by Gradle"/>
@ -1549,6 +1645,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="6d6a13a51ac3806c11af5f0967092055e35a67df6a74bff1544d9f5518c5ad55" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="apksig" version="7.4.1">
<artifact name="apksig-7.4.1.jar">
<sha256 value="6d6a13a51ac3806c11af5f0967092055e35a67df6a74bff1544d9f5518c5ad55" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="apkzlib" version="7.2.2">
<artifact name="apkzlib-7.2.2.jar">
<sha256 value="c705d8061b04e914cf75a6d289ee044e895cb1fd2a5c9af343bc8c119aca6de2" origin="Generated by Gradle"/>
@ -1559,6 +1660,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="79474dbb7505515a7fe081149a119aa4c6580ac4da8dc3ea7d3675956b00fffc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="apkzlib" version="7.4.1">
<artifact name="apkzlib-7.4.1.jar">
<sha256 value="79474dbb7505515a7fe081149a119aa4c6580ac4da8dc3ea7d3675956b00fffc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder" version="7.2.2">
<artifact name="builder-7.2.2.jar">
<sha256 value="f4c1ae6db2aa4b2dc021db5659c71f6af81157a2975a59da78e811b8b509f1af" origin="Generated by Gradle"/>
@ -1575,6 +1681,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="8d28eb6eb8cf31a635bbd90af829e8de53424e833a13c4b791c69a5b8e30fc54" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder" version="7.4.1">
<artifact name="builder-7.4.1.jar">
<sha256 value="d0017cc9409f4745dfe704a8a2fbb7bea3aaf499718817e3ebe6515f84b1990b" origin="Generated by Gradle"/>
</artifact>
<artifact name="builder-7.4.1.module">
<sha256 value="32826f8c45f806740ffa69ef7c67e6ca4c36ef847f3fcb1019b0082960a4bc14" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder-model" version="7.2.2">
<artifact name="builder-model-7.2.2.jar">
<sha256 value="2022a6eeff0c61f33828ab686dce947b638d04495902436c021fb5b3bb7e6338" origin="Generated by Gradle"/>
@ -1591,6 +1705,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="3ed775bbe6bdc69cf73fa9190c2549d75bff525a80a140545d7691ff99d85c28" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder-model" version="7.4.1">
<artifact name="builder-model-7.4.1.jar">
<sha256 value="f4f6f37c73c3a3cfa11a324eccb52056de1a19e89b9d5e7c59ef3dbd9bf49f13" origin="Generated by Gradle"/>
</artifact>
<artifact name="builder-model-7.4.1.module">
<sha256 value="c3462caeb751c27ba30e682c670c45292a257cf3c36775f5f5f75320cf01ee3d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder-test-api" version="7.2.2">
<artifact name="builder-test-api-7.2.2.jar">
<sha256 value="666ef0e31788df8a00eec2a6d4b978a6269b70b3eaa225ea7ba2bf72687b74e9" origin="Generated by Gradle"/>
@ -1607,6 +1729,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="16ea7ed99d27d21423a569074296f1662b15af1ec89715223b3d22d444c355ad" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder-test-api" version="7.4.1">
<artifact name="builder-test-api-7.4.1.jar">
<sha256 value="00af4e97750607defc045345ef5bd207c6879b92b59ab422b32d3e2d5386c5e1" origin="Generated by Gradle"/>
</artifact>
<artifact name="builder-test-api-7.4.1.module">
<sha256 value="2373380bbaa67a9aa73ff8e7dc07cda8e2e26636c10b584bf235812f2e7a40e9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="bundletool" version="1.11.4">
<artifact name="bundletool-1.11.4.jar">
<sha256 value="27f985038e020997c7d0c23a6cdbb5b3d1de9d091f926748deeb265aa62aae25" origin="Generated by Gradle"/>
@ -1633,6 +1763,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="b3006dde4c5957235dbb1f056684e3b957e888fb3f49c361d34cb8ff4faf80fe" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle" version="7.4.1">
<artifact name="gradle-7.4.1.jar">
<sha256 value="893c816bfd6c82ac08e45c65491ba3f307ee2e26d09628b6af730b6d9cf4e555" origin="Generated by Gradle"/>
</artifact>
<artifact name="gradle-7.4.1.module">
<sha256 value="58d1eeed98e23e144c3ceed6a8ad83fa87ad8f671457fa2f1b8c353a4e051b40" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle-api" version="7.2.2">
<artifact name="gradle-api-7.2.2.jar">
<sha256 value="94e5b786e74e731a23d221f109292a9dcbf3d8ca5d4a7cf2065b418759ae110d" origin="Generated by Gradle"/>
@ -1649,6 +1787,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="5cf9cfcf9f498cae6054c1d624b03f1745dfe24fb2b28439ab726ca76d7e0ad6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle-api" version="7.4.1">
<artifact name="gradle-api-7.4.1.jar">
<sha256 value="7ff6e212ade19490b5a7a3271de7ff26a11cd4ffba02444641666bf8e55d955b" origin="Generated by Gradle"/>
</artifact>
<artifact name="gradle-api-7.4.1.module">
<sha256 value="402921f24c9c2f51ae80fa3e26b326cb2037843ae0de9571ff47e3191848f0da" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle-settings-api" version="7.4.0">
<artifact name="gradle-settings-api-7.4.0.jar">
<sha256 value="5c5b71328889f5fe16b02cd0a98c54a7a7792bc66ee1c3f3360f037f9958ada7" origin="Generated by Gradle"/>
@ -1657,6 +1803,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="84feb291e1b56ff0ad8c6250544619c98658df21583596d0188c8e225990a023" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle-settings-api" version="7.4.1">
<artifact name="gradle-settings-api-7.4.1.jar">
<sha256 value="3f4d99f54e0f0af7c30065c8a2ba2f8fce8734b336f7149ad539f1e1e42d600e" origin="Generated by Gradle"/>
</artifact>
<artifact name="gradle-settings-api-7.4.1.module">
<sha256 value="6b392b991775b2e7cb9f916bb71839d282cd29f372fb10832b777b41ea7f760c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="manifest-merger" version="30.2.2">
<artifact name="manifest-merger-30.2.2.jar">
<sha256 value="4518ba42b1890acdfec41cf7ea30212042f33bbeb682f62aa0be06148b69eede" origin="Generated by Gradle"/>
@ -1673,6 +1827,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="56f0a106d94eb981b2f0fdefdb727a1ed272574cd990d1b06e3af5229a678e3c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="manifest-merger" version="30.4.1">
<artifact name="manifest-merger-30.4.1.jar">
<sha256 value="303191a7421a7426bc8925c47a8d515d29042d43d25eeb67ce07055e5136a087" origin="Generated by Gradle"/>
</artifact>
<artifact name="manifest-merger-30.4.1.module">
<sha256 value="88b5a974fdf25eca50861be3235c478f84401541f844f06a23dc61fc20f5f959" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="transform-api" version="2.0.0-deprecated-use-gradle-api">
<artifact name="transform-api-2.0.0-deprecated-use-gradle-api.jar">
<sha256 value="4de4a3d05e1c534c2db9e4588bf34082bb2bd232d8abb9727c430290ce225740" origin="Generated by Gradle"/>
@ -1714,6 +1876,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="7157fafd4932de9e78737972cbd55eade7ba15e85fe3f522ca939af74b5cc489" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.ddms" name="ddmlib" version="30.4.1">
<artifact name="ddmlib-30.4.1.jar">
<sha256 value="7157fafd4932de9e78737972cbd55eade7ba15e85fe3f522ca939af74b5cc489" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.emulator" name="proto" version="30.2.2">
<artifact name="proto-30.2.2.jar">
<sha256 value="cab182760fdd57c575bf058f3e70e82986af7b12e5d655d40d93db99e85b8f29" origin="Generated manually"/>
@ -1759,6 +1926,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="6b668eb1875462d558d5130061321b504385a69c4c1303036da4793768ed592b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.4.1">
<artifact name="layoutlib-api-30.4.1.jar">
<sha256 value="6b668eb1875462d558d5130061321b504385a69c4c1303036da4793768ed592b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint" version="30.2.2">
<artifact name="lint-30.2.2.jar">
<sha256 value="0282dd1831bc449b635c98c2a5060572a4366685e34b2955b8b2ab271c5e3570" origin="Generated by Gradle"/>
@ -1809,6 +1981,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="315a24f47cc7b98d58c582e5e1bb490673301ecdf6b906d7170284c39f462c1b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-model" version="30.4.1">
<artifact name="lint-model-30.4.1.jar">
<sha256 value="315a24f47cc7b98d58c582e5e1bb490673301ecdf6b906d7170284c39f462c1b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-tests" version="30.2.2">
<artifact name="lint-tests-30.2.2.jar">
<sha256 value="baf519a77ae8f094ad9f7023d58339640bc7cf16d09bdae75b2137ee1ce8c63b" origin="Generated by Gradle"/>
@ -1824,6 +2001,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="26c9384cd0cc727c0985097baf4fbcd90d556e06bb0f586c175ca9912fbc66ff" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.lint" name="lint-typedef-remover" version="30.4.1">
<artifact name="lint-typedef-remover-30.4.1.jar">
<sha256 value="26c9384cd0cc727c0985097baf4fbcd90d556e06bb0f586c175ca9912fbc66ff" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="30.2.2">
<artifact name="android-device-provider-ddmlib-30.2.2.jar">
<sha256 value="d5dfb5749b211a89146e95a18483f5b3729048323281f425176ba83f4dba63bd" origin="Generated by Gradle"/>
@ -1845,6 +2027,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="332794db1e7702c9689c8075532f235cccbf57d70aba29cbd7d378e781bad37f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="30.4.1">
<artifact name="android-device-provider-ddmlib-proto-30.4.1.jar">
<sha256 value="332794db1e7702c9689c8075532f235cccbf57d70aba29cbd7d378e781bad37f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-device-provider-gradle" version="30.2.2">
<artifact name="android-device-provider-gradle-30.2.2.jar">
<sha256 value="df7425b586d61d8a49f8804e582da238cadaf495f3cc61b2122549d635dce97d" origin="Generated by Gradle"/>
@ -1866,6 +2053,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="d8e9cdd6075752ed88422a5c37324d9aa6a2a0ea79abcbc61dcc89b8e47f8e98" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="30.4.1">
<artifact name="android-device-provider-gradle-proto-30.4.1.jar">
<sha256 value="d8e9cdd6075752ed88422a5c37324d9aa6a2a0ea79abcbc61dcc89b8e47f8e98" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="30.2.2">
<artifact name="android-test-plugin-host-additional-test-output-30.2.2.jar">
<sha256 value="f2d8ecd58abad30a65dd05ec6cb5b484d20bcb754e7b9d935f616867b54b9664" origin="Generated by Gradle"/>
@ -1887,6 +2079,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="e9ca7656307bff316ca4612a31e996b3e4bb3ca5471248e99add426ffd759936" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="30.4.1">
<artifact name="android-test-plugin-host-additional-test-output-proto-30.4.1.jar">
<sha256 value="e9ca7656307bff316ca4612a31e996b3e4bb3ca5471248e99add426ffd759936" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="30.2.2">
<artifact name="android-test-plugin-host-coverage-30.2.2.jar">
<sha256 value="0efc6c4662f061770d2a97d7e50b0d458ae0777d45cc11e29e8bc6ca022927c9" origin="Generated by Gradle"/>
@ -1908,6 +2105,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="2f865cb722be65f8772b218afef4381a574506359b8fed792c077b40202ef210" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="30.4.1">
<artifact name="android-test-plugin-host-coverage-proto-30.4.1.jar">
<sha256 value="2f865cb722be65f8772b218afef4381a574506359b8fed792c077b40202ef210" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="30.2.2">
<artifact name="android-test-plugin-host-device-info-30.2.2.jar">
<sha256 value="1ad132515ed4bdb221fb61d586a497ac955daee37397f186bc1bbbfc0dd29433" origin="Generated manually"/>
@ -1953,6 +2155,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="b05e6429a93aa548d1ddc8b3a23affad850a7ac7a7424074517bf42c0b76f110" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="30.4.1">
<artifact name="android-test-plugin-host-retention-proto-30.4.1.jar">
<sha256 value="b05e6429a93aa548d1ddc8b3a23affad850a7ac7a7424074517bf42c0b76f110" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="30.2.2">
<artifact name="android-test-plugin-result-listener-gradle-30.2.2.jar">
<sha256 value="e8a9b582b35d204d189de48f9b2abffa3233cafdc5b93bc9539cfe04077ec14c" origin="Generated manually"/>
@ -1974,6 +2181,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="d4fd8996ac9a03ee65d1b1823ebd6b70fb0c9b07252a6cd2a38614835b256707" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="30.4.1">
<artifact name="android-test-plugin-result-listener-gradle-proto-30.4.1.jar">
<sha256 value="d4fd8996ac9a03ee65d1b1823ebd6b70fb0c9b07252a6cd2a38614835b256707" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.annimon" name="stream" version="1.1.8">
<artifact name="stream-1.1.8.jar">
<sha256 value="5da6e2e3e0551d61a3ea7014f04312276549e3dd739cf637996e4cf43c5535b9" origin="Generated by Gradle"/>
@ -2469,6 +2681,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.4.0">
<artifact name="error_prone_annotations-2.4.0.jar">
<sha256 value="5f2a0648230a662e8be049df308d583d7369f13af683e44ddf5829b6d741a228" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.9.0">
<artifact name="error_prone_annotations-2.9.0.jar">
<sha256 value="f947bdc33ae27a6b4aa44799e6c21e1944797bd0010ba43eb82d11446e163694" origin="Generated by Gradle"/>
@ -2992,6 +3209,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.squareup" name="javapoet" version="1.10.0">
<artifact name="javapoet-1.10.0.jar">
<sha256 value="20ef4b82e43ff7c652281a21313cf3b941092467add3fa73509c26f6969efdab" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.squareup" name="javapoet" version="1.13.0">
<artifact name="javapoet-1.13.0.jar">
<sha256 value="4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291" origin="Generated by Gradle"/>
@ -4287,6 +4509,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="3551f0a8387356dcd1869db71afebd87077982d62f22735fe2d3b80c70a5d15c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-android-extensions" version="1.8.0">
<artifact name="kotlin-android-extensions-1.8.0.jar">
<sha256 value="8208c4ede42cd4cb18484041859b76b366eb5a326eea7b05a9144e64421735ce" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-android-extensions-runtime" version="1.6.21">
<artifact name="kotlin-android-extensions-runtime-1.6.21.jar">
<sha256 value="c09a4ea036c2269fb41934c809ee3db39de2f9bcca081297ab8ba2be79c9d27f" origin="Generated by Gradle"/>
@ -4307,6 +4534,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="9579df2eb4d5a3f045a8b65eadf7198c08af3243a3c92a4736bc3cd0b92e7b6b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-annotation-processing-gradle" version="1.8.0">
<artifact name="kotlin-annotation-processing-gradle-1.8.0.jar">
<sha256 value="aecbcbdea89e161f3a9848e1d8351cf8bca7fad6466daecfaf00f2b6cfd5d81a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.6.21">
<artifact name="kotlin-build-common-1.6.21.jar">
<sha256 value="63eea405d35e34e82025c2f4156e3d4757cb8f259499623356ca666bd210019d" origin="Generated by Gradle"/>
@ -4317,6 +4549,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="95d2fbfd7e987ed607fdc9e6d09d4d87a9782a71dceb91c3200ef4f113f2fb04" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.8.0">
<artifact name="kotlin-build-common-1.8.0.jar">
<sha256 value="a83726d89d28fccd6e92379d0f10da0a410c996e35780513fd297c33fcd543f5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.5.20">
<artifact name="kotlin-compiler-embeddable-1.5.20.jar">
<sha256 value="11d51087eb70b5abbad6fbf459a4349a0335916588000b5ecd990f01482e38ff" origin="Generated by Gradle"/>
@ -4342,6 +4579,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="5ec2be1872dc47b9dcb466f1781eded6c59d9eee18657d4b0f1148e619caea36" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.8.0">
<artifact name="kotlin-compiler-embeddable-1.8.0.jar">
<sha256 value="e9b3a56dbbfdf1e0328d4731b7d7ca789ce0f1f263372ad88dd8decbd1602858" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.6.21">
<artifact name="kotlin-compiler-runner-1.6.21.jar">
<sha256 value="2061b0e3b7b7530bf6720d8b0410be1326fb16cd4dadc37e77c02acfefe5a0b3" origin="Generated by Gradle"/>
@ -4352,6 +4594,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="e1331fab199208d115f157cb06d14a568c30dcaedfb3f7bdeeda16d1861b0f67" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.8.0">
<artifact name="kotlin-compiler-runner-1.8.0.jar">
<sha256 value="481b28bf3a55885afe25943bccffe0b83d454ebad6a8609fce418f1e9123da83" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.6.21">
<artifact name="kotlin-daemon-client-1.6.21.jar">
<sha256 value="6476b007364f545ce677a39b9331bc21b56abd7b566f039f51f21508a3902fa7" origin="Generated by Gradle"/>
@ -4362,6 +4609,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="c9ba3a944b00ae636634ec346239371c9a049727d9a02a8e2125cd231430b878" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.8.0">
<artifact name="kotlin-daemon-client-1.8.0.jar">
<sha256 value="a6c59121463100c896496f22295f78bdd1c03b719d8ce01d9cf19c7d14c4a5c8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.5.20">
<artifact name="kotlin-daemon-embeddable-1.5.20.jar">
<sha256 value="5a2e1e6869d130d937b39c668ea6bca758ef8960d168847f6e13aa2a2add424a" origin="Generated by Gradle"/>
@ -4387,6 +4639,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="e669ab8d2677d00f799fc86018551fbd9bd6b3c1d09fdb3f0eec8c4f44f62e63" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.8.0">
<artifact name="kotlin-daemon-embeddable-1.8.0.jar">
<sha256 value="52f320973fa339a1c2b8f71a38af1402e90527b13c7d564ea79170fc81d4bf66" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="1.6.21">
<artifact name="kotlin-gradle-plugin-1.6.21.jar">
<sha256 value="6753a2e1126d3f993a951af2adc06b1ec4ca27176e96c8f632777990104d15ad" origin="Generated by Gradle"/>
@ -4400,6 +4657,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="43942e46e63dfe87a31728411d20639d2888454632a33970b3c0e70005310b50" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="1.8.0">
<artifact name="kotlin-gradle-plugin-1.8.0-gradle75.jar">
<sha256 value="8f00c47c3f620161acf58d7112d156fefbd73c662dd3bb573ea5bc81d1511504" origin="Generated by Gradle"/>
</artifact>
<artifact name="kotlin-gradle-plugin-1.8.0.module">
<sha256 value="2afe8b4f8290ea87ec85c2bcdc6be9167da6d70590a385667f6d6530f65be194" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="1.6.21">
<artifact name="kotlin-gradle-plugin-api-1.6.21.jar">
<sha256 value="c74c1f17916cac6d72806264988d15e3219af246090791374eae9cb9af2e7cb3" origin="Generated by Gradle"/>
@ -4416,6 +4681,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="1de4b4b0be21bde6a20df99626a462448306604b5110f8c6e0ddce902827fbd1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="1.8.0">
<artifact name="kotlin-gradle-plugin-api-1.8.0-gradle75.jar">
<sha256 value="3cec4bf26a3d20ba65537f65a2dc8700c98ffc7e038ad9d2047b6b4e22103a8f" origin="Generated by Gradle"/>
</artifact>
<artifact name="kotlin-gradle-plugin-api-1.8.0.jar">
<sha256 value="3cec4bf26a3d20ba65537f65a2dc8700c98ffc7e038ad9d2047b6b4e22103a8f" origin="Generated by Gradle"/>
</artifact>
<artifact name="kotlin-gradle-plugin-api-1.8.0.module">
<sha256 value="a75dd4aaf2b6d3209f566ecb2c3b17fa8f76d17390a81ab9204ddd89c873c5c9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="1.7.20">
<artifact name="kotlin-gradle-plugin-idea-1.7.20.jar">
<sha256 value="d11bb085408a0b9c6ec1265ebc069fb771c494f0904fb641fcf02354bcd56b1d" origin="Generated by Gradle"/>
@ -4424,11 +4700,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="78303498eaee46e115a0916a2fdc92862849f51987c93f33b94d87091a701a3c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="1.8.0">
<artifact name="kotlin-gradle-plugin-idea-1.8.0.jar">
<sha256 value="9cd6ea5e4997dd3853d9407bdc0d3329d9e99ce7ea9bf91d204e1eb0d2439507" origin="Generated by Gradle"/>
</artifact>
<artifact name="kotlin-gradle-plugin-idea-1.8.0.module">
<sha256 value="381bae8ab354b5cfb1b7b994f271cb178b1554dd405d10c0a47e2fd8a0bea1d2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="1.7.20">
<artifact name="kotlin-gradle-plugin-idea-proto-1.7.20.jar">
<sha256 value="00081214394ac3a6de47dfb8dde0b299be233c16a2d1e67601959bb037fa8af0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="1.8.0">
<artifact name="kotlin-gradle-plugin-idea-proto-1.8.0.jar">
<sha256 value="b9ee61f8b73db4cef6db0736db8ed5af01f8654ec495217bfda1dac6665b8ada" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="1.6.21">
<artifact name="kotlin-gradle-plugin-model-1.6.21.jar">
<sha256 value="6059b1c61308fb859a01e758b2b8fd0adaff741b3df80235fade95ad6ab89687" origin="Generated by Gradle"/>
@ -4442,6 +4731,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="2201f4fe9f4a2a655c40c7f72994718006e465fd3736131da822728764433d42" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="1.8.0">
<artifact name="kotlin-gradle-plugin-model-1.8.0.jar">
<sha256 value="cfda095b6fbe558053f06b83aec73f08657b6eeb5405d16d492aae1e8ec50197" origin="Generated by Gradle"/>
</artifact>
<artifact name="kotlin-gradle-plugin-model-1.8.0.module">
<sha256 value="ee4e07e23c3d108eb2b2a0f5b7ca51c1e5ba9120288d1980f49495d64d6c195c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="1.6.21">
<artifact name="kotlin-klib-commonizer-api-1.6.21.jar">
<sha256 value="d2cf6952eef3894aacf8a9d8cf1e8c67bf215b4ef90268a8c9031834530a3874" origin="Generated by Gradle"/>
@ -4452,6 +4749,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="ed3e06676c608a828d516f19658b8a03bc31cf1dbbdd3c6095d29eb3da64cca8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="1.8.0">
<artifact name="kotlin-klib-commonizer-api-1.8.0.jar">
<sha256 value="b2842afbb2e907bedf61be11aab5a82c569d273c248ef4857810a77a1eed6bba" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="1.6.21">
<artifact name="kotlin-klib-commonizer-embeddable-1.6.21.jar">
<sha256 value="d6381a7eaebb7e48fca76bf5bb9e5f43fa56dde6fd5105cae8de135e63280f70" origin="Generated by Gradle"/>
@ -4462,6 +4764,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="72ea64f27c95082a0838bb71b6d5f5d5b42319320c15e09568a4675f8a831141" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="1.8.0">
<artifact name="kotlin-klib-commonizer-embeddable-1.8.0.jar">
<sha256 value="8de7e2ce2b1b565a3804f733c0f2589b2ed697c89331c87b05f77bdea068189f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="1.6.21">
<artifact name="kotlin-native-utils-1.6.21.jar">
<sha256 value="6bd87224e56ae15ffe2104d3c7633d72af6c7b358245ad3c4a76c6d5fd0d36bf" origin="Generated by Gradle"/>
@ -4472,6 +4779,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="8da7e56a0bf0eadd2b08846c2a276f4fae19b4f379d64d8eee4b4447bb54234d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="1.8.0">
<artifact name="kotlin-native-utils-1.8.0.jar">
<sha256 value="58fea6ea699429ee4253288673cc40381aa49b2c2f3153bf3933e0a769530f23" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-parcelize-compiler" version="1.6.21">
<artifact name="kotlin-parcelize-compiler-1.6.21.jar">
<sha256 value="6046f8e2d7a296adf2bee9039dadf9bbaca5d05b2faf2a8d5435b1dbd07dac40" origin="Generated by Gradle"/>
@ -4502,6 +4814,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="67a2665d697e9e9416a29a4b6083e355a287920f337694995fbe880a664c2bff" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-project-model" version="1.8.0">
<artifact name="kotlin-project-model-1.8.0.jar">
<sha256 value="edb224d370436604aa7612247d3f9204e2f1865e15618a683fd26a61ef2f720a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.3.71">
<artifact name="kotlin-reflect-1.3.71.jar">
<sha256 value="59c57ab609494d2a30d6ea3737428a56918ff0b8031081ea73b8472fdec06e44" origin="Generated by Gradle"/>
@ -4527,6 +4844,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="6e0f5490e6b9649ddd2670534e4d3a03bd283c3358b8eef5d1304fd5f8a5a4fb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.6.10">
<artifact name="kotlin-reflect-1.6.10.jar">
<sha256 value="3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.6.21">
<artifact name="kotlin-reflect-1.6.21.jar">
<sha256 value="1e1f57209f7238c3fd1735a1b9339a56565507dca249f8371bf59d91f601aeaa" origin="Generated by Gradle"/>
@ -4572,6 +4894,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="696f56daac19b75a20fdffa899f0a40750ba7cdf910dd198af7f05692d31e015" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.8.0">
<artifact name="kotlin-script-runtime-1.8.0.jar">
<sha256 value="e0d8dd6cebd091f99ffeaceaa1e54caf6ca5e94f1753bdc13b825128944ac9ec" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="1.6.21">
<artifact name="kotlin-scripting-common-1.6.21.jar">
<sha256 value="bfbf5f036237cd33c25fba33d48948d995db8186ce3f09c31af9c29c80ce9cae" origin="Generated by Gradle"/>
@ -4582,6 +4909,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="33850570129d7f6cb5a2f2bc20d3d02263e3d963486a37891383d8ae7486debc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="1.8.0">
<artifact name="kotlin-scripting-common-1.8.0.jar">
<sha256 value="7ceefa406e6d091d678930b84b16ba05f8cc5e4a8391cfa6f93d2495e7ff48f9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="1.6.21">
<artifact name="kotlin-scripting-compiler-embeddable-1.6.21.jar">
<sha256 value="5c9373af3ae40b73d6d7624b24e8ce117214495d862de6d2cfb618a7119106b1" origin="Generated by Gradle"/>
@ -4592,6 +4924,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="1a7533623d1cc10a3a209d7f01c58b4cf65b510ddf88e64f85c2180e7dac4293" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="1.8.0">
<artifact name="kotlin-scripting-compiler-embeddable-1.8.0.jar">
<sha256 value="01f6305c49b85454ba5e20406062617a97cf6e1f2ff4976d6f08656a66829279" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="1.6.21">
<artifact name="kotlin-scripting-compiler-impl-embeddable-1.6.21.jar">
<sha256 value="e4044b8de01e84633923706f43cda80d37d8bbef8ce9a866f9d95962ddd20480" origin="Generated by Gradle"/>
@ -4602,6 +4939,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="3e117702b33e61f3c2351243c750a9739164d85e8976e36a255e01afc9787184" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="1.8.0">
<artifact name="kotlin-scripting-compiler-impl-embeddable-1.8.0.jar">
<sha256 value="492c008859ceb72178b5f85b57440a60186c1cfe3d8f710d1e7a2ca3f7dc8e48" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="1.6.21">
<artifact name="kotlin-scripting-jvm-1.6.21.jar">
<sha256 value="92c03feabf4bdd92d5a22c51a748bd34027467c3d8f4c65fb5b574b86b07d104" origin="Generated by Gradle"/>
@ -4612,6 +4954,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="f941e4c94f73146a3e5a8996bc3841daa873890561de003545fec1616b031f97" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="1.8.0">
<artifact name="kotlin-scripting-jvm-1.8.0.jar">
<sha256 value="d2d916d706302438d29b807d391e65c7a4b2ea2fa774f2d0624f1179461325ec" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.2.60">
<artifact name="kotlin-stdlib-1.2.60.jar">
<sha256 value="6a130298f5171ac52a1e2496f7eae785b6f56416ea3ccb99e4344d04d83ff071" origin="Generated by Gradle"/>
@ -4672,6 +5019,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="7779ec96b9acbf92ca023858ac04543f9d2c3bdf1722425fff42f25ff3acfc9b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.0">
<artifact name="kotlin-stdlib-1.8.0.jar">
<sha256 value="c77bef8774640b9fb9d6e217459ff220dae59878beb7d2e4b430506feffc654e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.2.60">
<artifact name="kotlin-stdlib-common-1.2.60.jar">
<sha256 value="09b4375a065cf127abc998c5dcf22b1664c45af42b489499d7a8f4f8ab793fb1" origin="Generated by Gradle"/>
@ -4737,6 +5089,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="e0e91962bc0007338bf5b1739f62927ac32d14ba3d827fa608ab4e5351729d5d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.8.0">
<artifact name="kotlin-stdlib-common-1.8.0.jar">
<sha256 value="78ef93b59e603cc0fe51def9bd4c037b07cbace3b3b7806d1a490a42bc1f4cb2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.3.71">
<artifact name="kotlin-stdlib-jdk7-1.3.71.jar">
<sha256 value="b046a5ef54c7006db852e48e547aaff525a9e7a0a5909ffe5fe2c966c1a3a72e" origin="Generated by Gradle"/>
@ -4787,6 +5144,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="524da3c1a2ad56fd52c4ae2272ef3de421de8d2047ab1c51fc306d351243f2f5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.0">
<artifact name="kotlin-stdlib-jdk7-1.8.0.jar">
<sha256 value="4c889d1d9803f5f2eb6c1592a6b7e62369ac7660c9eee15aba16fec059163666" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.3.71">
<artifact name="kotlin-stdlib-jdk8-1.3.71.jar">
<sha256 value="a22192ac779ba8eff09d07084ae503e8be9e7c8ca1cb2b511ff8af4c68d83d66" origin="Generated by Gradle"/>
@ -4837,6 +5199,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="1da0d306c995945e1f807240ef64b5cd2dd5ac58612afb1a8596143d10b7ded5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.0">
<artifact name="kotlin-stdlib-jdk8-1.8.0.jar">
<sha256 value="05b62804441b0c9a1920b6b7d5cf7329a4e24b6258478e32b1f046ca01900946" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-test" version="1.3.71">
<artifact name="kotlin-test-1.3.71.jar">
<sha256 value="d9236ecd3c5b22c23e2892537276f3c1fab63f439b5bdceb115a8768aacb3998" origin="Generated by Gradle"/>
@ -4852,6 +5219,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="3797f1835342fbc12ec9c1d4f98332ba028291a33251a907c9227d8fd94aee48" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="1.8.0">
<artifact name="kotlin-tooling-core-1.8.0.jar">
<sha256 value="c8958d94e1c1210936c131d388c3237c9ccf2e6189d236c9e07a6946e50f66b3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-tooling-metadata" version="1.6.21">
<artifact name="kotlin-tooling-metadata-1.6.21.jar">
<sha256 value="4ec93d0516066b0b648ba987c6d3d65f6fb067dc0bbba95c1ece61e0428488e5" origin="Generated by Gradle"/>
@ -4867,6 +5239,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="aede08b11a141706f6a75d64dad2d704637d8f4435eac11b212c7b546c600c62" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-util-io" version="1.8.0">
<artifact name="kotlin-util-io-1.8.0.jar">
<sha256 value="a6498464178192d11542b3fe0058e91cf7adab88a8cd9568068914001e0fa65c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="1.6.21">
<artifact name="kotlin-util-klib-1.6.21.jar">
<sha256 value="ee218a9e8180c1b348c1ac1cf8ad718f6aac78ba7e26b5081323484f643c61b2" origin="Generated by Gradle"/>
@ -4877,6 +5254,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="8534ac8eb04876be0ef0ba1c2e31f76916869a4253ddbdfcff48cec979886030" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="1.8.0">
<artifact name="kotlin-util-klib-1.8.0.jar">
<sha256 value="408b0e48683ceda65e5b5bc7e79a53f4a1acf2610a4280d18f26e9659eccccbd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="atomicfu" version="0.14.4">
<artifact name="atomicfu-0.14.4.module">
<sha256 value="b2233a82fb0764b0b616ae48b96eb3dc2f0b4968a85d5f826708a686b6aefd37" origin="Generated by Gradle"/>

29
image-editor/app/build.gradle
View file

@ -1,44 +1,17 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'signal-sample-app'
id 'kotlin-kapt'
}
android {
namespace 'org.signal.imageeditor.app'
compileSdk COMPILE_SDK
defaultConfig {
applicationId "org.signal.imageeditor.app"
versionCode 1
versionName "1.0"
multiDexEnabled true
minSdk MINIMUM_SDK
targetSdk TARGET_SDK
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
}
dependencies {
implementation libs.androidx.core.ktx
implementation libs.androidx.appcompat
implementation libs.material.material
implementation project(':core-util')
implementation project(':image-editor')
implementation libs.glide.glide

5
image-editor/app/src/test/java/com/example/imageeditor/app/ExampleUnitTest.kt
View file

@ -1,9 +1,8 @@
package com.example.imageeditor.app
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.Assert.*
/**
* Example local unit test, which will execute on the development machine (host).
*
@ -14,4 +13,4 @@ class ExampleUnitTest {
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}
}

30
image-editor/lib/build.gradle
View file

@ -1,39 +1,11 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'signal-library'
}
android {
namespace 'org.signal.imageeditor'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
}
dependencies {
lintChecks project(':lintchecks')
implementation project(':core-util')
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.core.ktx
implementation libs.androidx.annotation
implementation libs.androidx.appcompat
}

14
image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/SelectedElementGuideRenderer.kt
View file

@ -4,9 +4,9 @@ import android.graphics.Color
import android.graphics.DashPathEffect
import android.graphics.Paint
import android.graphics.Path
import org.signal.core.util.DimensionUnit
import android.os.Parcel
import android.os.Parcelable
import org.signal.core.util.DimensionUnit
import org.signal.imageeditor.core.Bounds
import org.signal.imageeditor.core.Renderer
import org.signal.imageeditor.core.RendererContext
@ -15,10 +15,14 @@ class SelectedElementGuideRenderer : Renderer {
private val allPointsOnScreen = FloatArray(8)
private val allPointsInLocalCords = floatArrayOf(
Bounds.LEFT, Bounds.TOP,
Bounds.RIGHT, Bounds.TOP,
Bounds.RIGHT, Bounds.BOTTOM,
Bounds.LEFT, Bounds.BOTTOM
Bounds.LEFT,
Bounds.TOP,
Bounds.RIGHT,
Bounds.TOP,
Bounds.RIGHT,
Bounds.BOTTOM,
Bounds.LEFT,
Bounds.BOTTOM
)
private val circleRadius = DimensionUnit.DP.toPixels(5f)

2
image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/TrashRenderer.kt
View file

@ -67,7 +67,7 @@ internal class TrashRenderer : InvalidateableRenderer, Renderer, Parcelable {
rendererContext.canvas.drawCircle(buttonCenter[0], buttonCenter[1], diameter / 2f, shadePaint)
rendererContext.canvas.drawCircle(buttonCenter[0], buttonCenter[1], diameter / 2f, outlinePaint)
rendererContext.canvas.translate(bounds.centerX(), bounds.bottom - diameterLarge / 2f - padBottom)
rendererContext.canvas.translate(- (trashSize / 2f), - (trashSize / 2f))
rendererContext.canvas.translate(-(trashSize / 2f), -(trashSize / 2f))
trash.draw(rendererContext.canvas)
rendererContext.canvas.restore()

5
libsignal/service/build.gradle
View file

@ -22,11 +22,6 @@ compileJava {
options.release = 8
}
repositories {
mavenCentral()
mavenLocal()
}
configurations {
ideaTestFixturesImplementation { extendsFrom testFixturesImplementation; canBeConsumed false; canBeResolved true }
}

5
lintchecks/build.gradle
View file

@ -1,10 +1,5 @@
apply plugin: 'java-library'
repositories {
google()
mavenCentral()
}
dependencies {
compileOnly lintLibs.lint.api
compileOnly lintLibs.lint.checks

27
paging/app/build.gradle
View file

@ -1,36 +1,15 @@
apply plugin: 'com.android.application'
plugins {
id 'signal-sample-app'
}
android {
namespace 'org.signal.pagingtest'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
applicationId "org.signal.pagingtest"
versionCode 1
versionName "1.0"
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
}
dependencies {
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.appcompat
implementation libs.material.material
implementation libs.androidx.constraintlayout
testImplementation testLibs.junit.junit
implementation project(':paging')
}

26
paging/lib/build.gradle
View file

@ -1,29 +1,11 @@
apply plugin: 'com.android.library'
plugins {
id 'signal-library'
}
android {
namespace 'org.signal.paging'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
}
dependencies {
implementation libs.androidx.appcompat
implementation libs.androidx.multidex
implementation libs.material.material
implementation libs.rxjava3.rxandroid
implementation libs.rxjava3.rxjava
implementation project(':core-util')
testImplementation testLibs.junit.junit
}
}

55
photoview/build.gradle
View file

@ -1,64 +1,11 @@
plugins {
id 'com.android.library'
id 'com.google.protobuf'
id 'kotlin-android'
id 'kotlin-kapt'
id 'signal-library'
}
android {
namespace 'com.github.chrisbanes.photoview'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
}
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.18.0'
}
generateProtoTasks {
all().each { task ->
task.builtins {
java {
option "lite"
}
}
}
}
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.4.1'
lintChecks project(':lintchecks')
coreLibraryDesugaring libs.android.tools.desugar
api libs.androidx.annotation
implementation libs.androidx.core.ktx
implementation libs.androidx.lifecycle.common.java8
implementation libs.google.protobuf.javalite
implementation libs.androidx.sqlite
implementation libs.rxjava3.rxjava
testImplementation testLibs.junit.junit
testImplementation testLibs.mockito.core
testImplementation (testLibs.robolectric.robolectric) {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}
}

7
qr/app/build.gradle
View file

@ -1,4 +1,6 @@
apply from: "$rootProject.projectDir/signalModuleApp.gradle"
plugins {
id 'signal-sample-app'
}
android {
namespace 'org.signal.qrtest'
@ -10,9 +12,6 @@ android {
dependencies {
implementation project(':qr')
implementation libs.rxjava3.rxjava
implementation libs.rxjava3.rxandroid
implementation libs.rxjava3.rxkotlin
implementation libs.google.zxing.android.integration
implementation libs.google.zxing.core

9
qr/lib/build.gradle
View file

@ -1,10 +1,15 @@
apply from: "$rootProject.projectDir/signalModule.gradle"
plugins {
id 'signal-library'
}
android {
namespace 'org.signal.qr'
}
dependencies {
implementation project(':core-util')
implementation libs.androidx.camera.core
implementation libs.androidx.camera.camera2
implementation libs.androidx.camera.lifecycle
@ -15,6 +20,4 @@ dependencies {
implementation libs.google.guava.android
implementation libs.google.zxing.android.integration
implementation libs.google.zxing.core
implementation libs.rxjava3.rxjava
}

31
settings.gradle
View file

@ -1,3 +1,34 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
includeBuild("build-logic")
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
mavenLocal()
maven {
url "https://raw.githubusercontent.com/signalapp/maven/master/sqlcipher/release/"
content {
includeGroupByRegex "org\\.signal.*"
}
}
maven {
url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
}
jcenter {
content {
includeVersion "mobi.upod", "time-duration-picker", "1.1.3"
}
}
}
}
enableFeaturePreview('VERSION_CATALOGS')
include ':app'

49
signalModuleApp.gradle
View file

@ -1,49 +0,0 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'org.jlleitschuh.gradle.ktlint'
android {
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
versionCode 1
versionName "1.0"
minSdkVersion 21
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
kotlinOptions {
jvmTarget = '1.8'
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
}
ktlint {
// Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
version = "0.47.1"
}
dependencies {
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.activity.ktx
implementation libs.androidx.appcompat
implementation libs.material.material
implementation libs.androidx.constraintlayout
implementation libs.kotlin.stdlib.jdk8
testImplementation testLibs.junit.junit
implementation project(':core-util')
ktlintRuleset libs.ktlint.twitter.compose
}

12
sms-exporter/app/build.gradle
View file

@ -1,4 +1,6 @@
apply from: "$rootProject.projectDir/signalModuleApp.gradle"
plugins {
id 'signal-sample-app'
}
android {
namespace 'org.signal.smsexporter.app'
@ -9,13 +11,5 @@ android {
}
dependencies {
implementation libs.androidx.core.ktx
implementation libs.androidx.appcompat
implementation libs.androidx.core.role
implementation libs.material.material
implementation libs.rxjava3.rxjava
implementation libs.rxjava3.rxandroid
implementation libs.rxjava3.rxkotlin
implementation project(':core-util')
implementation project(':sms-exporter')
}

22
sms-exporter/lib/build.gradle
View file

@ -1,30 +1,14 @@
apply from: "$rootProject.projectDir/signalModule.gradle"
plugins {
id 'signal-library'
}
android {
namespace 'org.signal.smsexporter'
}
dependencies {
lintChecks project(':lintchecks')
implementation project(':core-util')
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.core.ktx
implementation libs.androidx.annotation
implementation libs.androidx.appcompat
implementation libs.androidx.core.role
implementation libs.android.smsmms
implementation libs.rxjava3.rxjava
implementation libs.rxjava3.rxandroid
implementation libs.rxjava3.rxkotlin
testImplementation testLibs.junit.junit
testImplementation testLibs.mockito.core
testImplementation testLibs.mockito.android
testImplementation testLibs.mockito.kotlin
testImplementation testLibs.robolectric.robolectric
testImplementation testLibs.androidx.test.core
testImplementation testLibs.androidx.test.core.ktx
}

53
spinner/app/build.gradle
View file

@ -1,63 +1,18 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jlleitschuh.gradle.ktlint'
}
repositories {
maven {
url "https://raw.githubusercontent.com/signalapp/maven/master/sqlcipher/release/"
content {
includeGroupByRegex "org\\.signal.*"
}
}
}
ktlint {
// Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
version = "0.47.1"
id 'signal-sample-app'
}
android {
namespace 'org.signal.spinnertest'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
applicationId "org.signal.spinnertest"
versionCode 1
versionName "1.0"
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
kotlinOptions {
jvmTarget = '1.8'
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
}
dependencies {
coreLibraryDesugaring libs.android.tools.desugar
implementation libs.androidx.core.ktx
implementation libs.androidx.activity.ktx
implementation libs.androidx.appcompat
implementation libs.material.material
implementation libs.androidx.multidex
implementation libs.androidx.constraintlayout
implementation libs.signal.android.database.sqlcipher
implementation libs.androidx.sqlite
testImplementation testLibs.junit.junit
implementation project(':spinner')
implementation libs.androidx.sqlite
implementation libs.signal.android.database.sqlcipher
}

38
spinner/lib/build.gradle
View file

@ -1,45 +1,17 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'org.jlleitschuh.gradle.ktlint'
id 'signal-library'
}
android {
namespace 'org.signal.spinner'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
}
ktlint {
// Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
version = "0.47.1"
}
dependencies {
implementation libs.jknack.handlebars
implementation libs.androidx.appcompat
implementation libs.material.material
implementation libs.androidx.multidex
implementation libs.androidx.sqlite
implementation project(':core-util')
testImplementation testLibs.junit.junit
implementation libs.jknack.handlebars
implementation libs.nanohttpd.webserver
implementation libs.androidx.sqlite
testImplementation testLibs.junit.junit
}

55
sticky-header-grid/build.gradle
View file

@ -1,64 +1,11 @@
plugins {
id 'com.android.library'
id 'com.google.protobuf'
id 'kotlin-android'
id 'kotlin-kapt'
id 'signal-library'
}
android {
namespace 'com.codewaves.stickyheadergrid'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
multiDexEnabled true
}
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
kotlinOptions {
jvmTarget = '1.8'
}
}
protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.18.0'
}
generateProtoTasks {
all().each { task ->
task.builtins {
java {
option "lite"
}
}
}
}
}
dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
lintChecks project(':lintchecks')
coreLibraryDesugaring libs.android.tools.desugar
api libs.androidx.annotation
implementation libs.androidx.core.ktx
implementation libs.androidx.lifecycle.common.java8
implementation libs.google.protobuf.javalite
implementation libs.androidx.sqlite
implementation libs.rxjava3.rxjava
testImplementation testLibs.junit.junit
testImplementation testLibs.mockito.core
testImplementation (testLibs.robolectric.robolectric) {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}
}

21
video/build.gradle
View file

@ -1,27 +1,12 @@
apply plugin: 'com.android.library'
plugins {
id 'signal-library'
}
android {
namespace 'org.signal.video'
buildToolsVersion BUILD_TOOL_VERSION
compileSdkVersion COMPILE_SDK
defaultConfig {
minSdkVersion MINIMUM_SDK
targetSdkVersion TARGET_SDK
}
compileOptions {
sourceCompatibility JAVA_VERSION
targetCompatibility JAVA_VERSION
}
}
dependencies {
lintChecks project(':lintchecks')
api libs.androidx.annotation
implementation project(':core-util')
implementation(libs.bundles.mp4parser) {