Skip to content

fix(android): upgrade build toolchain for Sonar compatibility - #125

Merged
swatigoel merged 1 commit into
inji:release-1.0.xfrom
tw-mosip:fix/android-toolchain-compatibility
Aug 10, 2026
Merged

swatigoel merged 1 commit into
inji:release-1.0.xfrom
tw-mosip:fix/android-toolchain-compatibility

Conversation

@abhip2565

@abhip2565 abhip2565 commented Aug 10, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • Upgrade AGP, Gradle, Kotlin, namespace, and Sonar configuration for JDK 21 Sonar compatibility.
  • Preserve compile/target SDK 31 and Java/Kotlin 1.8 compatibility for release consumers.

Verification

  • ./gradlew clean build with JDK 17
  • Local SonarQube analysis with JDK 21; scanner and compute tasks succeeded

@coderabbitai

coderabbitai Bot commented Aug 10, 2026 •

Copy link
Copy Markdown

Review Change Stack

Walkthrough

The Android module now uses updated Kotlin, Android SDK, Gradle, and Android DSL versions. The manifest declares no package attribute. Unix and Windows Gradle wrappers receive synchronized compatibility and exit-code updates.

Changes

Android and Gradle modernization

Layer / File(s) Summary
Toolchain version updates
kotlin/android/gradle.properties, kotlin/android/gradle/wrapper/gradle-wrapper.properties
Kotlin, compile SDK, target SDK, and Gradle versions were upgraded. Wrapper timeout and URL validation settings were added.
Android DSL and namespace migration
kotlin/android/build.gradle, kotlin/android/src/main/AndroidManifest.xml
The build uses modern Android DSL properties, declares a namespace, targets Java and Kotlin 17, and removes the manifest package attribute.
Cross-platform wrapper updates
kotlin/android/gradlew, kotlin/android/gradlew.bat
The wrapper scripts update command checks, annotations, argument handling, condition syntax, and Gradle exit-code propagation.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Poem

New tools align in a tidy row,
Kotlin and SDKs rise and glow.
Wrappers guard each command with care,
Java seventeen joins the air,
Gradle steps forward everywhere.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: upgrading the Android build toolchain to support Sonar compatibility.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@abhip2565
abhip2565 marked this pull request as ready for review August 10, 2026 08:58

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@kotlin/android/gradle.properties`:
- Around line 1-4: Update the Android toolchain version properties represented
by SecureKeystore_kotlinVersion, the Gradle version, and the Android Gradle
Plugin version as a compatible set: retain the required Gradle minimum, use a
Kotlin version supported by that Gradle release, and set AGP to at least 8.1.1
for the existing SDK 34 values.

In `@kotlin/android/gradle/wrapper/gradle-wrapper.properties`:
- Around line 3-5: Add the official SHA-256 checksum for the Gradle 8.5 binary
distribution as the distributionSha256Sum property in the Gradle wrapper
configuration, alongside distributionUrl. Preserve the existing URL, timeout,
and validateDistributionUrl settings.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: f8784a89-7c1c-4561-a679-44875c06f07d

📥 Commits

Reviewing files that changed from the base of the PR and between 365320e and 7ce70fd.

⛔ Files ignored due to path filters (1)
  • kotlin/android/gradle/wrapper/gradle-wrapper.jar is excluded by !**/*.jar
📒 Files selected for processing (6)
  • kotlin/android/build.gradle
  • kotlin/android/gradle.properties
  • kotlin/android/gradle/wrapper/gradle-wrapper.properties
  • kotlin/android/gradlew
  • kotlin/android/gradlew.bat
  • kotlin/android/src/main/AndroidManifest.xml

Comment thread kotlin/android/gradle.properties Outdated
Comment thread kotlin/android/gradle/wrapper/gradle-wrapper.properties
Signed-off-by: abhip2565 <paul.apaul.abhishek.ap@gmail.com>
@abhip2565
abhip2565 force-pushed the fix/android-toolchain-compatibility branch from bb26d0d to 27b6e79 Compare August 10, 2026 09:16
@swatigoel
swatigoel merged commit 288313e into inji:release-1.0.x Aug 10, 2026
4 checks passed
swatigoel added a commit that referenced this pull request Aug 21, 2026
* Merge pull request #115 from tw-mosip/bump-up-version

chore: bump of libray publish version - 1.0.0-alpha.1-SNAPSHOT

* refactor: remove js folder (#116)

Signed-off-by: KiruthikaJeyashankar <kiruthikavjshankar@gmail.com>

* [inji/inji-wallet#2539] Replace MPL License with Apache License 2.0 (#118)

Signed-off-by: Mahesh-Binayak <Mahesh-Binayak@users.noreply.github.com>
Co-authored-by: Mahesh-Binayak <Mahesh-Binayak@users.noreply.github.com>

* refactor: udpate license to Apache 2.0 (#123)

Signed-off-by: Kaushik Gupta <146950347+Kaushikgupta469@users.noreply.github.com>

* Fixes: mosip#373 - Updated push-trigger.yml, android-artifact-build.yml and tag.yml files. (#124)

Signed-off-by: Mohanraj209 <mohan1715@gmail.com>
Co-authored-by: Mohanraj209 <mohan1715@gmail.com>

* fix(android): upgrade build toolchain for Sonar compatibility (#125)

Signed-off-by: abhip2565 <paul.apaul.abhishek.ap@gmail.com>

* Fixes: mosip#373 - Updated push-trigger file. (#126)

* Fixes: mosip#373 - Updated push-trigger.yml, android-artifact-build.yml and tag.yml files.

Signed-off-by: Mohanraj209 <mohan1715@gmail.com>

* Fixes: mosip#373 - Updated push-trigger file.

Signed-off-by: Mohanraj209 <mohan1715@gmail.com>

---------

Signed-off-by: Mohanraj209 <mohan1715@gmail.com>
Co-authored-by: Mohanraj209 <mohan1715@gmail.com>

* update workflows to use tagged version of kattu and skip sonar job (#127)

* Update workflow to use tag version of kattu and commented sonar job

Signed-off-by: Kaushik Gupta <146950347+Kaushikgupta469@users.noreply.github.com>

* update tag.yml to tag.yaml to point to kattu tag version-0.0.1

Signed-off-by: Kaushik Gupta <146950347+Kaushikgupta469@users.noreply.github.com>

---------

Signed-off-by: Kaushik Gupta <146950347+Kaushikgupta469@users.noreply.github.com>

* [DSD-10674] inji-wallet 1.0.0-alpha.1 release chanegs (#128)

Signed-off-by: Prafulrakhade <prafulrakhade02@gmail.com>

* fix: add missing signing config to android publish artifact (#129)

* fix: add missing signing config to android publish artifact

Signed-off-by: abhip2565 <paul.apaul.abhishek.ap@gmail.com>

* fix(gpg): apply signing plugin to Kotlin module

Signed-off-by: abhip2565 <paul.apaul.abhishek.ap@gmail.com>

---------

Signed-off-by: abhip2565 <paul.apaul.abhishek.ap@gmail.com>

---------

Signed-off-by: KiruthikaJeyashankar <kiruthikavjshankar@gmail.com>
Signed-off-by: Mahesh-Binayak <Mahesh-Binayak@users.noreply.github.com>
Signed-off-by: Kaushik Gupta <146950347+Kaushikgupta469@users.noreply.github.com>
Signed-off-by: Mohanraj209 <mohan1715@gmail.com>
Signed-off-by: abhip2565 <paul.apaul.abhishek.ap@gmail.com>
Signed-off-by: Prafulrakhade <prafulrakhade02@gmail.com>
Co-authored-by: KiruthikaJeyashankar <kiruthikavjshankar@gmail.com>
Co-authored-by: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com>
Co-authored-by: Mahesh-Binayak <Mahesh-Binayak@users.noreply.github.com>
Co-authored-by: Kaushik Gupta <146950347+Kaushikgupta469@users.noreply.github.com>
Co-authored-by: Mohan E <mohanraj1715@gmail.com>
Co-authored-by: Mohanraj209 <mohan1715@gmail.com>
Co-authored-by: abhip2565 <paul.apaul.abhishek.AP@gmail.com>
Co-authored-by: Praful Rakhade <prafulrakhade02@gmail.com>
Co-authored-by: Swati Goel <swati@inji.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants