Skip to content

Conversation

@jimlyas
Copy link

@jimlyas jimlyas commented Oct 13, 2025

Description

This Merge Include:

Migrating from Groovy DSL to Kotlin DSL

Migrate from Groovy to Kotlin DSL for the build script

  • build.gradle to build.gradle.kts
  • jacoco.gradle to jacoco.gradle.kts
  • settings.gradle to settings.gradle.kts
  • app/build.gradle to app/build.gradle.kts
  • appscan/build.gradle to appscan/build.gradle.kts

there's some improvement to like grouping some configuration and setup in one place.

Generating jacoco report task

Previously, the project run generate report task to trigger the unit test task.

This PR reverse that, so we only need to run the unit test and after it finished, then Gradle will run the task that generate jacoco report.

Another reason being is, when running the unit test task, Android Studio will display Run Test window that help visibility to see which task is passed and which task is failed. Like this:

evidence.mp4

Version Catalog

  • Migrate from extras-based versioning to use version catalog for versioning
  • Implement all the convention Gradle plugin from version catalog
  • Group dependencies together using bundles

Other

From previous setup, to run "checkstyle" task it needs checkstyle.xml but I can't find it anywhere inside the project.

  • Tests written, or not not needed

Copy link
Collaborator

@alperozturk96 alperozturk96 left a comment

Choose a reason for hiding this comment

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

Hello,

Thank you for the excellent PR 🚀. This is a fantastic addition.

Could you please update the PR to address the points I’ve highlighted?

Jimly Asshiddiqy added 3 commits October 14, 2025 08:55
- Rename build.gradle to build.gradle.kts
- Rename settings.gradle to settings.gradle
- Rename jacoco.gradle to jacoco.gradle.kts
- Refactor some entries in the libs.versions.toml
- Change running test task from to run jacoco task to trigger task, now it's reversed... we run the test task that will trigger the jacoco task

Signed-off-by: Jimly Asshiddiqy <[email protected]>
Signed-off-by: Jimly Asshiddiqy <[email protected]>
- Rename build.gradle to build.gradle.kts
- Rename settings.gradle to settings.gradle
- Rename jacoco.gradle to jacoco.gradle.kts
- Refactor some entries in the libs.versions.toml
- Change running test task from to run jacoco task to trigger task, now it's reversed... we run the test task that will trigger the jacoco task

Signed-off-by: Jimly Asshiddiqy <[email protected]>
- Move buildConfig
- Setup credential from .gradle/config.properties

Signed-off-by: Jimly Asshiddiqy <[email protected]>
Signed-off-by: Jimly Asshiddiqy <[email protected]>
Jimly Asshiddiqy and others added 15 commits October 14, 2025 15:27
- Use the right variable for testInstrumentationRunnerArguments

Signed-off-by: Jimly Asshiddiqy <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: Jimly Asshiddiqy <[email protected]>
alperozturk96 and others added 23 commits October 17, 2025 08:17
Signed-off-by: alperozturk <[email protected]>
…PreferenceActivity for SettingsActivity

Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>

# Conflicts:
#	build.gradle
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: alperozturk <[email protected]>
Signed-off-by: Jimly Asshiddiqy <[email protected]>
@alperozturk96
Copy link
Collaborator

alperozturk96 commented Oct 17, 2025

After solving Git conflicts, merging and pushing directly can cause a lot of file changes and unnecessary commits. Instead, you can rebase to the latest master and then force-push. This way, you’ll see only the related changes and exact commits.

Tips:

When solving Git conflicts, accept master’s changes.
Don’t push right away.
Then compare with your changes.

This approach makes conflict resolution much easier, especially when the differences are just dependency version updates you can simply replace those.

I hope it helps, thank you. @jimlyas

@jimlyas
Copy link
Author

jimlyas commented Oct 17, 2025

@alperozturk96 , thanks for the input.

Sorry for making a mess with this PR. Is there anything I can do? Or should I just close this PR and make a new one from scratch?

@AndyScherzinger
Copy link
Member

Hi @jimlyas
Both is fine, either a new one or rebase your PR on latest master branch of this repository.

@github-actions
Copy link

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@jimlyas
Copy link
Author

jimlyas commented Oct 28, 2025

@alperozturk96 @AndyScherzinger @tobiasKaminsky I've closed this PR and opened a new one here:

#15859

@jimlyas jimlyas closed this Oct 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants