Re-organize gradle modules.

app/build.gradle.kts

@@ -66,7 +66,7 @@ wire {
   }
 
   protoPath {
-    srcDir("${project.rootDir}/libsignal-service/src/main/protowire")
+    srcDir("${project.rootDir}/lib/libsignal-service/src/main/protowire")
   }
   // Handled by libsignal
   prune("signalservice.DecryptionErrorMessage")
@@ -489,21 +489,21 @@ dependencies {
   ktlintRuleset(libs.ktlint.twitter.compose)
   coreLibraryDesugaring(libs.android.tools.desugar)
 
-  implementation(project(":libsignal-service"))
-  implementation(project(":paging"))
-  implementation(project(":core-util"))
-  implementation(project(":glide-config"))
-  implementation(project(":video"))
-  implementation(project(":device-transfer"))
-  implementation(project(":image-editor"))
-  implementation(project(":donations"))
-  implementation(project(":debuglogs-viewer"))
-  implementation(project(":contacts"))
-  implementation(project(":qr"))
-  implementation(project(":sticky-header-grid"))
-  implementation(project(":photoview"))
-  implementation(project(":core-ui"))
-  implementation(project(":core-models"))
+  implementation(project(":lib:libsignal-service"))
+  implementation(project(":lib:paging"))
+  implementation(project(":core:util"))
+  implementation(project(":lib:glide-config"))
+  implementation(project(":lib:video"))
+  implementation(project(":lib:device-transfer"))
+  implementation(project(":lib:image-editor"))
+  implementation(project(":lib:donations"))
+  implementation(project(":lib:debuglogs-viewer"))
+  implementation(project(":lib:contacts"))
+  implementation(project(":lib:qr"))
+  implementation(project(":lib:sticky-header-grid"))
+  implementation(project(":lib:photoview"))
+  implementation(project(":core:ui"))
+  implementation(project(":core:models"))
 
   implementation(libs.androidx.fragment.ktx)
   implementation(libs.androidx.appcompat) {
@@ -603,9 +603,9 @@ dependencies {
   implementation(libs.androidx.credentials.compat)
   implementation(libs.kotlinx.serialization.json)
 
-  implementation(project(":billing"))
+  implementation(project(":lib:billing"))
 
-  "spinnerImplementation"(project(":spinner"))
+  "spinnerImplementation"(project(":lib:spinner"))
 
   "canaryImplementation"(libs.square.leakcanary)
 
@@ -631,7 +631,7 @@ dependencies {
   }
   testImplementation(testLibs.conscrypt.openjdk.uber)
   testImplementation(testLibs.mockk)
-  testImplementation(testFixtures(project(":libsignal-service")))
+  testImplementation(testFixtures(project(":lib:libsignal-service")))
   testImplementation(testLibs.espresso.core)
   testImplementation(testLibs.kotlinx.coroutines.test)
   testImplementation(libs.androidx.compose.ui.test.junit4)

build-logic/plugins/src/main/java/signal-sample-app.gradle.kts

@@ -52,7 +52,7 @@ android {
 dependencies {
   coreLibraryDesugaring(libs.android.tools.desugar)
 
-  implementation(project(":core-util"))
+  implementation(project(":core:util"))
 
   coreLibraryDesugaring(libs.android.tools.desugar)
 

build.gradle.kts

@@ -55,7 +55,8 @@ subprojects {
     }
   }
 
-  val skipQa = setOf("Signal-Android", "libsignal-service", "lintchecks", "benchmark", "core-util-jvm", "core-models", "logging")
+  // Skip qa for: main app, pure Java/Kotlin libs, and implicit parent projects from hierarchical naming
+  val skipQa = setOf("Signal-Android", "libsignal-service", "lintchecks", "benchmark", "util-jvm", "models", "logging", "core", "lib", "demo", "feature")
 
   if (project.name !in skipQa && !project.name.endsWith("-app")) {
     tasks.register("qa") {
@@ -90,13 +91,13 @@ tasks.register("qa") {
     ":Signal-Android:testPlayProdPerfUnitTest",
     ":Signal-Android:lintPlayProdRelease",
     "Signal-Android:ktlintCheck",
-    ":libsignal-service:test",
-    ":libsignal-service:ktlintCheck",
+    ":lib:libsignal-service:test",
+    ":lib:libsignal-service:ktlintCheck",
     ":Signal-Android:assemblePlayProdRelease",
     ":Signal-Android:compilePlayProdInstrumentationAndroidTestSources",
     ":microbenchmark:compileReleaseAndroidTestSources",
-    ":core-util-jvm:test",
-    ":core-util-jvm:ktlintCheck"
+    ":core:util-jvm:test",
+    ":core:util-jvm:ktlintCheck"
   )
 }
 

core/models/build.gradle.kts

@@ -23,5 +23,5 @@ kotlin {
 dependencies {
   implementation(libs.libsignal.client)
   implementation(libs.square.okio)
-  implementation(project(":core-util-jvm"))
+  implementation(project(":core:util-jvm"))
 }

core/util-jvm/build.gradle.kts

@@ -45,7 +45,7 @@ wire {
 }
 
 tasks.runKtlintCheckOverMainSourceSet {
-  dependsOn(":core-util-jvm:generateMainProtos")
+  dependsOn(":core:util-jvm:generateMainProtos")
 }
 
 val sourceSets = extensions.getByName("sourceSets") as SourceSetContainer