mirror of
https://github.com/d4rken-org/capod.git
synced 2026-09-14 18:26:11 -04:00
- Merged all 76 locale strings.xml files from app-common to app module - Removed app-common module dependency from app/build.gradle.kts - Removed app-common from settings.gradle - Fixed all BuildConfig and R class import statements - Updated fully qualified R references from eu.darken.capod.common.R to R - Deleted entire app-common directory and all associated files - Added temporary fallback for missing GITSHA BuildConfig field The project now has a simplified structure with all string resources consolidated in the app module, eliminating the unnecessary app-common module while maintaining full functionality. Builds successfully for both FOSS and Google Play variants.
59 lines
1.7 KiB
Python
59 lines
1.7 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Script to fix import statements after removing app-common module.
|
|
This script fixes R class imports from app-common to app module.
|
|
"""
|
|
|
|
import os
|
|
import re
|
|
from pathlib import Path
|
|
|
|
def fix_r_import(file_path):
|
|
"""Fix R import in a single file."""
|
|
print(f"Fixing R import in: {file_path}")
|
|
|
|
with open(file_path, 'r', encoding='utf-8') as f:
|
|
content = f.read()
|
|
|
|
# Replace the import statement
|
|
updated_content = re.sub(
|
|
r'import eu\.darken\.capod\.common\.R$',
|
|
'import eu.darken.capod.R',
|
|
content,
|
|
flags=re.MULTILINE
|
|
)
|
|
|
|
if updated_content != content:
|
|
with open(file_path, 'w', encoding='utf-8') as f:
|
|
f.write(updated_content)
|
|
print(f" ✓ Updated import in {file_path}")
|
|
return True
|
|
else:
|
|
print(f" - No changes needed in {file_path}")
|
|
return False
|
|
|
|
def main():
|
|
"""Main function to fix all import statements."""
|
|
project_root = Path.cwd()
|
|
app_src = project_root / "app" / "src"
|
|
|
|
# Find all Kotlin files that import eu.darken.capod.common.R
|
|
files_to_fix = []
|
|
for kt_file in app_src.rglob("*.kt"):
|
|
with open(kt_file, 'r', encoding='utf-8') as f:
|
|
content = f.read()
|
|
if re.search(r'import eu\.darken\.capod\.common\.R$', content, re.MULTILINE):
|
|
files_to_fix.append(kt_file)
|
|
|
|
print(f"Found {len(files_to_fix)} files with incorrect R imports")
|
|
|
|
success_count = 0
|
|
for file_path in files_to_fix:
|
|
if fix_r_import(file_path):
|
|
success_count += 1
|
|
|
|
print(f"\nFixed imports in {success_count} files")
|
|
return 0
|
|
|
|
if __name__ == "__main__":
|
|
exit(main()) |