Skip to content

Commit

Permalink
Merge branch 'main' into update-agp-libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
duartebarbosadev authored Feb 13, 2025
2 parents 404dd9b + c2f077f commit e5122bd
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 9 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/auto-translate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,7 @@ jobs:

- name: Translate strings.xml to supported languages
id: translate
uses: duartebarbosadev/Android-String-Translator@main
#with:
# Adjust the project_path if your Android resource files are elsewhere.
#project_path: "./app/src/main/res"
#auto_translate: "true"
#validate_translations: "false"
#log_trace: "false"
uses: duartebarbosadev/Android-Resource-Translator@main
env:
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}

Expand Down
4 changes: 4 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ android {
}
}

lint {
lintConfig = file("lint.xml")
}

packaging {
resources { // Make sure to exclude the license files as for some reason they are probing project from compilation
excludes += "/META-INF/{AL2.0,LGPL2.1}"
Expand Down
8 changes: 8 additions & 0 deletions app/lint.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2025, Scrolless
All rights reserved.
-->
<lint>
<issue id="ExtraTranslation" severity="ignore" />
</lint>
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
Copyright (C) 2025, Scrolless
All rights reserved.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
2 changes: 2 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ dependencyResolutionManagement {

enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

gradle.startParameter.excludedTaskNames.addAll(listOf(":buildLogic:convention:testClasses"))

rootProject.name = "Scrolless"

include(
Expand Down

0 comments on commit e5122bd

Please sign in to comment.