From 53ea770c90a8dc32c337ed40538fe4c6e077bc21 Mon Sep 17 00:00:00 2001 From: stevenyomi <95685115+stevenyomi@users.noreply.github.com> Date: Tue, 13 Feb 2024 22:09:35 +0000 Subject: [PATCH] Rename projects to path names --- .github/workflows/build_pull_request.yml | 2 +- .github/workflows/build_push.yml | 2 +- settings.gradle.kts | 13 +++---------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index dc90824846c..a5182041b0b 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -73,4 +73,4 @@ jobs: - name: Build extensions (chunk ${{ matrix.chunk }}) env: CI_CHUNK_NUM: ${{ matrix.chunk }} - run: ./gradlew assembleDebug + run: ./gradlew -p src assembleDebug diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index f86411c6f73..a1752695a7d 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -81,7 +81,7 @@ jobs: ALIAS: ${{ secrets.ALIAS }} KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - run: ./gradlew assembleRelease + run: ./gradlew -p src assembleRelease - name: Upload APKs (chunk ${{ matrix.chunk }}) uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 diff --git a/settings.gradle.kts b/settings.gradle.kts index 2e7a59487e2..832a37a4193 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,10 +23,7 @@ if (System.getenv("CI") != "true") { run { // Loads individual extensions File(rootDir, "src").getChunk(chunk, chunkSize)?.forEach { - val name = ":extensions:individual:${it.parentFile.name}:${it.name}" - println(name) - include(name) - project(name).projectDir = File("src/${it.parentFile.name}/${it.name}") + include("src:${it.parentFile.name}:${it.name}") } } } @@ -34,16 +31,12 @@ if (System.getenv("CI") != "true") { fun loadAllIndividualExtensions() { File(rootDir, "src").eachDir { dir -> dir.eachDir { subdir -> - val name = ":extensions:individual:${dir.name}:${subdir.name}" - include(name) - project(name).projectDir = File("src/${dir.name}/${subdir.name}") + include("src:${dir.name}:${subdir.name}") } } } fun loadIndividualExtension(lang: String, name: String) { - val projectName = ":extensions:individual:$lang:$name" - include(projectName) - project(projectName).projectDir = File("src/${lang}/${name}") + include("src:${lang}:${name}") } fun File.getChunk(chunk: Int, chunkSize: Int): List? {