Skip to content

Commit 566ae75

Browse files
duartebarbosadevduartebarbosadev
authored
chore: rename mobile directory to app and update build configurations (#157)
1 parent 0433877 commit 566ae75

70 files changed

Lines changed: 16 additions & 16 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: ./gradlew test
5353

5454
- name: Build debug APKs
55-
run: ./gradlew :mobile:assembleOssDebug :mobile:assemblePlayDebug
55+
run: ./gradlew :app:assembleOssDebug :app:assemblePlayDebug
5656

5757
- name: Upload build outputs (APKs)
5858
uses: actions/upload-artifact@v4
@@ -68,14 +68,14 @@ jobs:
6868
path: '**/build/test-results/test*UnitTest/**.xml'
6969

7070
- name: Check lint
71-
run: ./gradlew :mobile:lintOssDebug :mobile:lintPlayDebug
71+
run: ./gradlew :app:lintOssDebug :app:lintPlayDebug
7272

7373
- name: Upload lint reports (HTML)
7474
if: ${{ !cancelled() }}
7575
uses: actions/upload-artifact@v4
7676
with:
7777
name: lint-reports
78-
path: 'mobile/build/reports/lint-results-*.html'
78+
path: 'app/build/reports/lint-results-*.html'
7979

8080
- name: Upload lint reports (SARIF)
8181
if: ${{ !cancelled() && hashFiles('**/*.sarif') != '' }}

‎.github/workflows/release.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- main
77
paths:
8-
- mobile/build.gradle.kts
8+
- app/build.gradle.kts
99
workflow_dispatch:
1010

1111
concurrency:
@@ -46,7 +46,7 @@ jobs:
4646
grep -E 'applicationId\s*=\s*"[^"]+"' "$1" | head -n1 | sed -E 's/.*=\s*"([^"]+)".*/\1/'
4747
}
4848
49-
current_file="mobile/build.gradle.kts"
49+
current_file="app/build.gradle.kts"
5050
current_version_code="$(extract_version_code "$current_file")"
5151
current_version_name="$(extract_version_name "$current_file")"
5252
current_application_id="$(extract_application_id "$current_file")"
@@ -164,35 +164,35 @@ jobs:
164164
ANDROID_RELEASE_STORE_PASSWORD: ${{ secrets.ANDROID_RELEASE_STORE_PASSWORD }}
165165
ANDROID_RELEASE_KEY_ALIAS: ${{ secrets.ANDROID_RELEASE_KEY_ALIAS }}
166166
ANDROID_RELEASE_KEY_PASSWORD: ${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}
167-
run: ./gradlew :mobile:assemblePlayRelease :mobile:bundlePlayRelease :mobile:assembleOssRelease
167+
run: ./gradlew :app:assemblePlayRelease :app:bundlePlayRelease :app:assembleOssRelease
168168

169169
- name: Validate release outputs
170170
if: steps.version.outputs.should_release == 'true'
171171
shell: bash
172172
run: |
173173
set -euo pipefail
174174
shopt -s nullglob
175-
play_apks=(mobile/build/outputs/apk/play/release/*.apk)
175+
play_apks=(app/build/outputs/apk/play/release/*.apk)
176176
if [ "${#play_apks[@]}" -eq 0 ]; then
177177
echo "No Play release APK files found."
178178
exit 1
179179
fi
180-
oss_apks=(mobile/build/outputs/apk/oss/release/*.apk)
180+
oss_apks=(app/build/outputs/apk/oss/release/*.apk)
181181
if [ "${#oss_apks[@]}" -eq 0 ]; then
182182
echo "No OSS release APK files found."
183183
exit 1
184184
fi
185-
aabs=(mobile/build/outputs/bundle/playRelease/*.aab)
185+
aabs=(app/build/outputs/bundle/playRelease/*.aab)
186186
shopt -u nullglob
187187
if [ "${#aabs[@]}" -eq 0 ]; then
188188
echo "No Play release AAB files found."
189189
exit 1
190190
fi
191-
if ls mobile/build/outputs/apk/play/release/*-unsigned.apk >/dev/null 2>&1; then
191+
if ls app/build/outputs/apk/play/release/*-unsigned.apk >/dev/null 2>&1; then
192192
echo "Found unsigned Play release APK. Configure release signing before publishing."
193193
exit 1
194194
fi
195-
if ls mobile/build/outputs/apk/oss/release/*-unsigned.apk >/dev/null 2>&1; then
195+
if ls app/build/outputs/apk/oss/release/*-unsigned.apk >/dev/null 2>&1; then
196196
echo "Found unsigned OSS release APK. Configure release signing before publishing."
197197
exit 1
198198
fi
@@ -203,7 +203,7 @@ jobs:
203203
with:
204204
serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
205205
packageName: ${{ steps.version.outputs.application_id }}
206-
releaseFiles: mobile/build/outputs/bundle/playRelease/*.aab
206+
releaseFiles: app/build/outputs/bundle/playRelease/*.aab
207207
track: internal
208208
status: completed
209209

@@ -216,5 +216,5 @@ jobs:
216216
name: ${{ steps.version.outputs.tag_name }}
217217
generate_release_notes: true
218218
files: |
219-
mobile/build/outputs/apk/play/release/*.apk
220-
mobile/build/outputs/apk/oss/release/*.apk
219+
app/build/outputs/apk/play/release/*.apk
220+
app/build/outputs/apk/oss/release/*.apk

mobile/build.gradle.kts renamed to app/build.gradle.kts

File renamed without changes.

mobile/lint.xml renamed to app/lint.xml

File renamed without changes.

mobile/proguard-rules.pro renamed to app/proguard-rules.pro

File renamed without changes.

mobile/src/main/AndroidManifest.xml renamed to app/src/main/AndroidManifest.xml

File renamed without changes.

mobile/src/main/ic_launcher-playstore.png renamed to app/src/main/ic_launcher-playstore.png

File renamed without changes.

mobile/src/main/java/com/scrolless/app/ScrollessApplication.kt renamed to app/src/main/java/com/scrolless/app/ScrollessApplication.kt

File renamed without changes.

mobile/src/main/java/com/scrolless/app/accessibility/ScrollessBlockAccessibilityService.kt renamed to app/src/main/java/com/scrolless/app/accessibility/ScrollessBlockAccessibilityService.kt

File renamed without changes.

mobile/src/main/java/com/scrolless/app/ui/MainActivity.kt renamed to app/src/main/java/com/scrolless/app/ui/MainActivity.kt

File renamed without changes.

0 commit comments

Comments
 (0)