From 1013e73ff81600f0ad5f6383ca1604b0f256445d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 28 Mar 2023 14:51:30 +0200 Subject: [PATCH 1/2] Limit the recursivity to 1, when searching for gradle modules. --- settings.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 2a491a2743..8abb803f94 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -73,7 +73,7 @@ include(":services:appnavstate:impl") include(":services:toolbox:api") include(":services:toolbox:impl") -fun includeProjects(directory: File, path: String) { +fun includeProjects(directory: File, path: String, maxDepth: Int = 1) { directory.listFiles().orEmpty().forEach { file -> if (file.isDirectory) { val newPath = "$path:${file.name}" @@ -81,8 +81,8 @@ fun includeProjects(directory: File, path: String) { if (buildFile.exists()) { include(newPath) println("Included project: $newPath") - } else { - includeProjects(file, newPath) + } else if (maxDepth > 0) { + includeProjects(file, newPath, maxDepth - 1) } } } From eb76a5a43f1bd8f3668041c103728958b6bb5f66 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 28 Mar 2023 15:04:59 +0200 Subject: [PATCH 2/2] Include all libraries and all services. --- settings.gradle.kts | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 8abb803f94..e44a2cb8fa 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -38,40 +38,11 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") rootProject.name = "ElementX" include(":app") include(":appnav") -include(":libraries:core") -include(":libraries:rustsdk") -include(":libraries:matrix:api") -include(":libraries:matrix:impl") -include(":libraries:matrix:test") -include(":libraries:matrixui") -include(":libraries:textcomposer") -include(":libraries:dateformatter:api") -include(":libraries:dateformatter:impl") -include(":libraries:dateformatter:test") -include(":libraries:elementresources") -include(":libraries:network") -include(":libraries:ui-strings") -include(":libraries:testtags") -include(":libraries:designsystem") -include(":libraries:di") include(":tests:uitests") include(":anvilannotations") include(":anvilcodegen") -include(":libraries:architecture") -include(":libraries:androidutils") -include(":samples:minimal") -include(":libraries:encrypted-db") -include(":libraries:session-storage:api") -include(":libraries:session-storage:impl") -include(":libraries:session-storage:impl-memory") -include(":libraries:statemachine") -include(":services:analytics:api") -include(":services:analytics:noop") -include(":services:appnavstate:api") -include(":services:appnavstate:impl") -include(":services:toolbox:api") -include(":services:toolbox:impl") +include(":samples:minimal") fun includeProjects(directory: File, path: String, maxDepth: Int = 1) { directory.listFiles().orEmpty().forEach { file -> @@ -88,5 +59,6 @@ fun includeProjects(directory: File, path: String, maxDepth: Int = 1) { } } -val featuresDir = File(rootDir, "features") -includeProjects(featuresDir, ":features") +includeProjects(File(rootDir, "features"), ":features") +includeProjects(File(rootDir, "libraries"), ":libraries") +includeProjects(File(rootDir, "services"), ":services")