diff --git a/core-ui/build.gradle b/core-ui/build.gradle deleted file mode 100644 index fa1334cf12..0000000000 --- a/core-ui/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - id 'signal-library' -} - -android { - namespace 'org.signal.core.ui' - - buildFeatures { - compose true - } - - composeOptions { - kotlinCompilerExtensionVersion = '1.4.4' - } -} - -dependencies { - lintChecks project(':lintchecks') - - def composeBom = platform(libs.androidx.compose.bom) - api composeBom - androidTestApi composeBom - api libs.androidx.compose.material3 - api libs.androidx.compose.ui.tooling.preview - debugApi libs.androidx.compose.ui.tooling.core -} diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts new file mode 100644 index 0000000000..dca5bd8291 --- /dev/null +++ b/core-ui/build.gradle.kts @@ -0,0 +1,28 @@ +plugins { + id("signal-library") +} + +android { + namespace = "org.signal.core.ui" + + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerExtensionVersion = "1.4.4" + } +} + +dependencies { + lintChecks(project(":lintchecks")) + + platform(libs.androidx.compose.bom).let { composeBom -> + api(composeBom) + androidTestApi(composeBom) + } + + api(libs.androidx.compose.material3) + api(libs.androidx.compose.ui.tooling.preview) + debugApi(libs.androidx.compose.ui.tooling.core) +} diff --git a/core-util/build.gradle b/core-util/build.gradle deleted file mode 100644 index 286409c2a4..0000000000 --- a/core-util/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - id 'signal-library' - id 'kotlin-kapt' - id 'com.squareup.wire' -} - -android { - namespace 'org.signal.core.util' -} - -dependencies { - api(project(':core-util-jvm')) - - implementation libs.androidx.sqlite - - testImplementation testLibs.junit.junit - testImplementation testLibs.mockito.core - testImplementation (testLibs.robolectric.robolectric) -} - -wire { - kotlin { - javaInterop = true - } - - sourcePath { - srcDir 'src/main/protowire' - } -} \ No newline at end of file diff --git a/core-util/build.gradle.kts b/core-util/build.gradle.kts new file mode 100644 index 0000000000..a848cb9e24 --- /dev/null +++ b/core-util/build.gradle.kts @@ -0,0 +1,29 @@ +plugins { + id("signal-library") + id("kotlin-kapt") + id("com.squareup.wire") +} + +android { + namespace = "org.signal.core.util" +} + +dependencies { + api(project(":core-util-jvm")) + + implementation(libs.androidx.sqlite) + + testImplementation(testLibs.junit.junit) + testImplementation(testLibs.mockito.core) + testImplementation(testLibs.robolectric.robolectric) +} + +wire { + kotlin { + javaInterop = true + } + + sourcePath { + srcDir("src/main/protowire") + } +} diff --git a/device-transfer/app/build.gradle b/device-transfer/app/build.gradle deleted file mode 100644 index 426e7a5678..0000000000 --- a/device-transfer/app/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'signal-sample-app' -} - -android { - namespace 'org.signal.devicetransfer.app' - - defaultConfig { - applicationId "org.signal.devicetransfer.app" - - ndk { - abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' - } - - buildConfigField "String", "LIBSIGNAL_VERSION", "\"libsignal ${libs.versions.libsignal.client.get()}\"" - } -} - -dependencies { - implementation project(':device-transfer') -} diff --git a/device-transfer/app/build.gradle.kts b/device-transfer/app/build.gradle.kts new file mode 100644 index 0000000000..40b199e410 --- /dev/null +++ b/device-transfer/app/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + id("signal-sample-app") +} + +android { + namespace = "org.signal.devicetransfer.app" + + defaultConfig { + applicationId = "org.signal.devicetransfer.app" + + ndk { + abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64") + } + + buildConfigField("String", "LIBSIGNAL_VERSION", "\"libsignal ${libs.versions.libsignal.client.get()}\"") + } +} + +dependencies { + implementation(project(":device-transfer")) +} diff --git a/device-transfer/lib/build.gradle b/device-transfer/lib/build.gradle deleted file mode 100644 index a797034260..0000000000 --- a/device-transfer/lib/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'signal-library' -} - -android { - namespace 'org.signal.devicetransfer' -} - -dependencies { - implementation project(':core-util') - implementation libs.libsignal.android - api libs.greenrobot.eventbus - - testImplementation (testLibs.robolectric.robolectric) { - exclude group: 'com.google.protobuf', module: 'protobuf-java' - } - testImplementation testLibs.robolectric.shadows.multidex - testImplementation testLibs.hamcrest.hamcrest - - testImplementation(testFixtures(project(":libsignal-service"))) -} diff --git a/device-transfer/lib/build.gradle.kts b/device-transfer/lib/build.gradle.kts new file mode 100644 index 0000000000..5ca621790e --- /dev/null +++ b/device-transfer/lib/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + id("signal-library") +} + +android { + namespace = "org.signal.devicetransfer" +} + +dependencies { + implementation(project(":core-util")) + implementation(libs.libsignal.android) + api(libs.greenrobot.eventbus) + + testImplementation(testLibs.robolectric.robolectric) { + exclude(group = "com.google.protobuf", module = "protobuf-java") + } + testImplementation(testLibs.robolectric.shadows.multidex) + testImplementation(testLibs.hamcrest.hamcrest) + + testImplementation(testFixtures(project(":libsignal-service"))) +} diff --git a/donations/app/build.gradle b/donations/app/build.gradle deleted file mode 100644 index e4ec0b85d0..0000000000 --- a/donations/app/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'signal-sample-app' - id 'kotlin-kapt' -} - -android { - namespace 'org.signal.donations.app' - - defaultConfig { - applicationId "org.signal.donations.app" - } -} - -dependencies { - implementation project(':donations') - implementation project(':core-util') -} diff --git a/donations/app/build.gradle.kts b/donations/app/build.gradle.kts new file mode 100644 index 0000000000..0bf984992e --- /dev/null +++ b/donations/app/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id("signal-sample-app") + id("kotlin-kapt") +} + +android { + namespace = "org.signal.donations.app" + + defaultConfig { + applicationId = "org.signal.donations.app" + } +} + +dependencies { + implementation(project(":donations")) + implementation(project(":core-util")) +} diff --git a/donations/lib/build.gradle b/donations/lib/build.gradle deleted file mode 100644 index c2b3827657..0000000000 --- a/donations/lib/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - id 'signal-library' - id 'kotlin-parcelize' -} - -android { - namespace 'org.signal.donations' -} - -dependencies { - implementation project(':core-util') - - implementation libs.kotlin.reflect - implementation libs.jackson.module.kotlin - implementation libs.jackson.core - - testImplementation (testLibs.robolectric.robolectric) { - exclude group: 'com.google.protobuf', module: 'protobuf-java' - } - - api libs.google.play.services.wallet - api libs.square.okhttp3 -} diff --git a/donations/lib/build.gradle.kts b/donations/lib/build.gradle.kts new file mode 100644 index 0000000000..bf0a70f9cc --- /dev/null +++ b/donations/lib/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + id("signal-library") + id("kotlin-parcelize") +} + +android { + namespace = "org.signal.donations" +} + +dependencies { + implementation(project(":core-util")) + + implementation(libs.kotlin.reflect) + implementation(libs.jackson.module.kotlin) + implementation(libs.jackson.core) + + testImplementation(testLibs.robolectric.robolectric) { + exclude(group = "com.google.protobuf", module = "protobuf-java") + } + + api(libs.google.play.services.wallet) + api(libs.square.okhttp3) +} diff --git a/glide-config/build.gradle b/glide-config/build.gradle deleted file mode 100644 index 64464b0ce5..0000000000 --- a/glide-config/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -plugins { - id 'signal-library' - id 'kotlin-kapt' -} - -android { - namespace 'org.signal.glide' -} - -dependencies { - implementation libs.glide.glide - kapt libs.glide.compiler - - implementation project(':glide-webp') -} diff --git a/glide-config/build.gradle.kts b/glide-config/build.gradle.kts new file mode 100644 index 0000000000..24a8c93df7 --- /dev/null +++ b/glide-config/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + id("signal-library") + id("kotlin-kapt") +} + +android { + namespace = "org.signal.glide" +} + +dependencies { + implementation(libs.glide.glide) + kapt(libs.glide.compiler) + + implementation(project(":glide-webp")) +} diff --git a/image-editor/app/build.gradle b/image-editor/app/build.gradle index 161a4ae98c..b68e94bc4b 100644 --- a/image-editor/app/build.gradle +++ b/image-editor/app/build.gradle @@ -1,19 +1,19 @@ plugins { - id 'signal-sample-app' - id 'kotlin-kapt' + id("signal-sample-app") + id("kotlin-kapt") } android { - namespace 'org.signal.imageeditor.app' + namespace = "org.signal.imageeditor.app" defaultConfig { - applicationId "org.signal.imageeditor.app" + applicationId = "org.signal.imageeditor.app" } } dependencies { - implementation project(':image-editor') + implementation(project(":image-editor")) - implementation libs.glide.glide - kapt libs.glide.compiler + implementation(libs.glide.glide) + kapt(libs.glide.compiler) } \ No newline at end of file diff --git a/image-editor/lib/build.gradle b/image-editor/lib/build.gradle index c9d5223e44..972de6d1ad 100644 --- a/image-editor/lib/build.gradle +++ b/image-editor/lib/build.gradle @@ -1,11 +1,11 @@ plugins { - id 'signal-library' + id("signal-library") } android { - namespace 'org.signal.imageeditor' + namespace = "org.signal.imageeditor" } dependencies { - implementation project(':core-util') + implementation(project(":core-util")) } \ No newline at end of file diff --git a/paging/app/build.gradle b/paging/app/build.gradle deleted file mode 100644 index 5a003895b6..0000000000 --- a/paging/app/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -plugins { - id 'signal-sample-app' -} - -android { - namespace 'org.signal.pagingtest' - - defaultConfig { - applicationId "org.signal.pagingtest" - } -} - -dependencies { - implementation project(':paging') -} \ No newline at end of file diff --git a/paging/app/build.gradle.kts b/paging/app/build.gradle.kts new file mode 100644 index 0000000000..3c63321a5b --- /dev/null +++ b/paging/app/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + id("signal-sample-app") +} + +android { + namespace = "org.signal.pagingtest" + + defaultConfig { + applicationId = "org.signal.pagingtest" + } +} + +dependencies { + implementation(project(":paging")) +} diff --git a/paging/lib/build.gradle b/paging/lib/build.gradle deleted file mode 100644 index aa3b1d694a..0000000000 --- a/paging/lib/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id 'signal-library' -} - -android { - namespace 'org.signal.paging' -} - -dependencies { - implementation project(':core-util') -} diff --git a/paging/lib/build.gradle.kts b/paging/lib/build.gradle.kts new file mode 100644 index 0000000000..4d2109b439 --- /dev/null +++ b/paging/lib/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("signal-library") +} + +android { + namespace = "org.signal.paging" +} + +dependencies { + implementation(project(":core-util")) +} diff --git a/photoview/build.gradle b/photoview/build.gradle deleted file mode 100644 index 5fde00f778..0000000000 --- a/photoview/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id 'signal-library' -} - -android { - namespace 'com.github.chrisbanes.photoview' -} - -dependencies { - implementation 'androidx.appcompat:appcompat:1.4.1' -} diff --git a/photoview/build.gradle.kts b/photoview/build.gradle.kts new file mode 100644 index 0000000000..7b8d44ecb1 --- /dev/null +++ b/photoview/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("signal-library") +} + +android { + namespace = "com.github.chrisbanes.photoview" +} + +dependencies { + implementation("androidx.appcompat:appcompat:1.4.1") +} diff --git a/qr/app/build.gradle b/qr/app/build.gradle deleted file mode 100644 index 0933d86b61..0000000000 --- a/qr/app/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id 'signal-sample-app' -} - -android { - namespace 'org.signal.qrtest' - - defaultConfig { - applicationId "org.signal.qrtest" - } -} - -dependencies { - implementation project(':qr') - - implementation libs.google.zxing.android.integration - implementation libs.google.zxing.core -} \ No newline at end of file diff --git a/qr/app/build.gradle.kts b/qr/app/build.gradle.kts new file mode 100644 index 0000000000..c33e62f4f0 --- /dev/null +++ b/qr/app/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + id("signal-sample-app") +} + +android { + namespace = "org.signal.qrtest" + + defaultConfig { + applicationId = "org.signal.qrtest" + } +} + +dependencies { + implementation(project(":qr")) + + implementation(libs.google.zxing.android.integration) + implementation(libs.google.zxing.core) +} diff --git a/qr/lib/build.gradle b/qr/lib/build.gradle deleted file mode 100644 index 94d7c62e44..0000000000 --- a/qr/lib/build.gradle +++ /dev/null @@ -1,23 +0,0 @@ -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 - implementation libs.androidx.camera.view - implementation libs.androidx.lifecycle.common.java8 - implementation libs.androidx.lifecycle.livedata.core - - implementation libs.google.guava.android - implementation libs.google.zxing.android.integration - implementation libs.google.zxing.core -} \ No newline at end of file diff --git a/qr/lib/build.gradle.kts b/qr/lib/build.gradle.kts new file mode 100644 index 0000000000..17adf85bbe --- /dev/null +++ b/qr/lib/build.gradle.kts @@ -0,0 +1,22 @@ +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) + implementation(libs.androidx.camera.view) + implementation(libs.androidx.lifecycle.common.java8) + implementation(libs.androidx.lifecycle.livedata.core) + + implementation(libs.google.guava.android) + implementation(libs.google.zxing.android.integration) + implementation(libs.google.zxing.core) +} diff --git a/sms-exporter/app/build.gradle b/sms-exporter/app/build.gradle index 47c18ec2f0..1f38a5392d 100644 --- a/sms-exporter/app/build.gradle +++ b/sms-exporter/app/build.gradle @@ -1,15 +1,15 @@ plugins { - id 'signal-sample-app' + id("signal-sample-app") } android { - namespace 'org.signal.smsexporter.app' + namespace = "org.signal.smsexporter.app" defaultConfig { - applicationId "org.signal.smsexporter.app" + applicationId = "org.signal.smsexporter.app" } } dependencies { - implementation project(':sms-exporter') + implementation(project(":sms-exporter")) } diff --git a/sms-exporter/lib/build.gradle b/sms-exporter/lib/build.gradle index 5f20e25adc..98bd33b35b 100644 --- a/sms-exporter/lib/build.gradle +++ b/sms-exporter/lib/build.gradle @@ -1,14 +1,14 @@ plugins { - id 'signal-library' + id("signal-library") } android { - namespace 'org.signal.smsexporter' + namespace = "org.signal.smsexporter" } dependencies { - implementation project(':core-util') + implementation(project(":core-util")) - implementation libs.androidx.core.role - implementation libs.android.smsmms + implementation(libs.androidx.core.role) + implementation(libs.android.smsmms) } \ No newline at end of file diff --git a/spinner/app/build.gradle b/spinner/app/build.gradle deleted file mode 100644 index df44d15e9f..0000000000 --- a/spinner/app/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id 'signal-sample-app' -} - -android { - namespace 'org.signal.spinnertest' - - defaultConfig { - applicationId "org.signal.spinnertest" - } -} - -dependencies { - implementation project(':spinner') - - implementation libs.androidx.sqlite - implementation libs.signal.android.database.sqlcipher -} \ No newline at end of file diff --git a/spinner/app/build.gradle.kts b/spinner/app/build.gradle.kts new file mode 100644 index 0000000000..bb1f0e0813 --- /dev/null +++ b/spinner/app/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + id("signal-sample-app") +} + +android { + namespace = "org.signal.spinnertest" + + defaultConfig { + applicationId = "org.signal.spinnertest" + } +} + +dependencies { + implementation(project(":spinner")) + + implementation(libs.androidx.sqlite) + implementation(libs.signal.android.database.sqlcipher) +} diff --git a/spinner/lib/build.gradle b/spinner/lib/build.gradle deleted file mode 100644 index 5a5819e40c..0000000000 --- a/spinner/lib/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id 'signal-library' -} - -android { - namespace 'org.signal.spinner' -} - -dependencies { - implementation project(':core-util') - - implementation libs.jknack.handlebars - implementation libs.nanohttpd.webserver - implementation libs.nanohttpd.websocket - implementation libs.androidx.sqlite - - testImplementation testLibs.junit.junit -} \ No newline at end of file diff --git a/spinner/lib/build.gradle.kts b/spinner/lib/build.gradle.kts new file mode 100644 index 0000000000..c73a65beee --- /dev/null +++ b/spinner/lib/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + id("signal-library") +} + +android { + namespace = "org.signal.spinner" +} + +dependencies { + implementation(project(":core-util")) + + implementation(libs.jknack.handlebars) + implementation(libs.nanohttpd.webserver) + implementation(libs.nanohttpd.websocket) + implementation(libs.androidx.sqlite) + + testImplementation(testLibs.junit.junit) +} diff --git a/sticky-header-grid/build.gradle b/sticky-header-grid/build.gradle deleted file mode 100644 index ef55b26f39..0000000000 --- a/sticky-header-grid/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id 'signal-library' -} - -android { - namespace 'com.codewaves.stickyheadergrid' -} - -dependencies { - implementation 'androidx.recyclerview:recyclerview:1.2.1' -} diff --git a/sticky-header-grid/build.gradle.kts b/sticky-header-grid/build.gradle.kts new file mode 100644 index 0000000000..f4dafededa --- /dev/null +++ b/sticky-header-grid/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("signal-library") +} + +android { + namespace = "com.codewaves.stickyheadergrid" +} + +dependencies { + implementation("androidx.recyclerview:recyclerview:1.2.1") +} diff --git a/video/lib/build.gradle b/video/lib/build.gradle deleted file mode 100644 index 47e27bb2d9..0000000000 --- a/video/lib/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -plugins { - id 'signal-library' -} - -android { - namespace 'org.signal.video' -} - -dependencies { - implementation project(':core-util') - - implementation(libs.bundles.mp4parser) { - exclude group: 'junit', module: 'junit' - } -} diff --git a/video/lib/build.gradle.kts b/video/lib/build.gradle.kts new file mode 100644 index 0000000000..176d39d5ba --- /dev/null +++ b/video/lib/build.gradle.kts @@ -0,0 +1,15 @@ +plugins { + id("signal-library") +} + +android { + namespace = "org.signal.video" +} + +dependencies { + implementation(project(":core-util")) + + implementation(libs.bundles.mp4parser) { + exclude(group = "junit", module = "junit") + } +}