Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle lintage #17338

Merged
merged 3 commits into from
Nov 1, 2024
Merged

Gradle lintage #17338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a15da5
chore: forward-port to new gradle file permission API
mikehardy Oct 31, 2024
3f1cef0
chore: main no longer has CAMERA permission, so amazon shouldn't remo…
mikehardy Oct 31, 2024
d876b7f
chore: forward port to new gradle report location API
mikehardy Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion AnkiDroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,11 @@ play {
tasks.register('installGitHook', Copy) {
from new File(rootProject.rootDir, 'pre-commit')
into { new File(rootProject.rootDir, '.git/hooks') }
fileMode 0755
filePermissions {
user {
read = write = execute = true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

group and other need no change, it's user that's important so that the commit hook works
verified it works still after this

}
}
}
// to run manually: `./gradlew installGitHook`
tasks.named('preBuild').configure { dependsOn('installGitHook') }
Expand Down
6 changes: 3 additions & 3 deletions AnkiDroid/jacoco.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def testReport = tasks.register('jacocoTestReport', JacocoReport) {

reports {
xml.required = true
html.destination htmlOutDir
html.outputLocation = htmlOutDir
}

def kotlinClasses = fileTree(dir: project.layout.buildDirectory.dir(classDir), excludes: fileFilter)
Expand Down Expand Up @@ -136,7 +136,7 @@ def unitTestReport = tasks.register('jacocoUnitTestReport', JacocoReport) {

reports {
xml.required = true
html.destination htmlOutDir
html.outputLocation = htmlOutDir
}

def kotlinClasses = fileTree(dir: project.layout.buildDirectory.dir(classDir), excludes: fileFilter)
Expand All @@ -161,7 +161,7 @@ def androidTestReport = tasks.register('jacocoAndroidTestReport', JacocoReport)

reports {
xml.required = true
html.destination htmlOutDir
html.outputLocation = htmlOutDir
}

def kotlinClasses = fileTree(dir: project.layout.buildDirectory.dir(classDir), excludes: fileFilter)
Expand Down
5 changes: 0 additions & 5 deletions AnkiDroid/src/amazon/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto">

<!-- This camera permission will be removed in the merged manifest due to node removal -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be time to remove amazon for good. I've stopped listing it on release annoucnements.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contemplated this before, re-contemplated it just now, here's what I saw in research:

So, I still have dreams here.

  • We may be able to remove the flavor and just use Play flavor as a separate issue since it doesn't seem to do anything different now (camera restriction was the only item? at least previously)
  • Triple-T is interested in ingestion if possible: Amazon Appstore support Triple-T/gradle-play-publisher#583

I think the path forward is a fork to amazon app publisher in order to get it working again exactly as it was, then doing a PR to Triple-T to make it a publish mode there

<uses-permission
android:name="android.permission.CAMERA"
tools:node="remove" />
</manifest>