Skip to content

Upgrade Kotlin to 2.0.21 in Stripe-dependent modules#521

Merged
sg-jsonjuliane merged 3 commits intodevelopfrom
refactor/25084-kotlin-upgrade
Jan 27, 2026
Merged

Upgrade Kotlin to 2.0.21 in Stripe-dependent modules#521
sg-jsonjuliane merged 3 commits intodevelopfrom
refactor/25084-kotlin-upgrade

Conversation

@sg-jsonjuliane
Copy link
Copy Markdown
Contributor

PR Context

  • Type: Refactor
  • Issue Link: Redmine Issue
  • Risk Factor: Medium - Kotlin version upgrade from 1.8.20 to 2.0.21 affects compilation and type checking. Room upgrade from 2.5.1 to 2.6.1 required for kapt compatibility. Changes are minimal and focused on version updates and kapt configuration.

Changes

Upgrade Kotlin to 2.0.21 and update Room to 2.6.1 for compatibility with kapt and Kotlin 2.0.

  • Updated Kotlin version from 1.8.20 to 2.0.21 in dependencies.gradle
  • Updated Room version from 2.5.1 to 2.6.1 in dependencies.gradle (required for kapt compatibility with Kotlin 2.0)
  • Updated Kotlin version in build.gradle to 2.0.21
  • Added kapt configuration in TripKitData/build.gradle for Kotlin 2.0 compatibility (useBuildCache, mapDiagnosticLocations)

Checklist for Reviewers

Documentation and Code Quality

  • KDocs Documentation: Are all changes, new functionalities, and classes documented with KDocs?
    • No new classes or functionalities added, only version updates and configuration changes
  • Architectural Patterns: Is there consistent and proper use of architectural patterns (e.g., MVVM, MVP)?
    • No architectural changes, only dependency version updates

Testing and Reliability

  • Unit Testing: Are there unit tests for all new functionalities and classes?
    • No new functionalities added, existing tests should continue to pass
  • Emulator and Real Device Testing: Has the application been tested on both emulators and real devices to ensure compatibility?
    • Build verification completed: ./gradlew :TripKitAndroid:assembleDebug :TripKitAndroid:assembleRelease

Error Handling and Logging

  • Error Handling: Are errors and exceptions caught and handled gracefully, ensuring the app remains stable?
    • No changes to error handling logic
  • Logging: Is there proper logging in place for critical errors and information, aiding in debugging and monitoring?
    • No changes to logging

Testing Procedure

Verification steps for the Kotlin upgrade:

  • Build verification: ./gradlew :TripKitAndroid:assembleDebug :TripKitAndroid:assembleRelease
  • Verify kapt compilation succeeds (no stub generation errors)
  • Verify Room DAO suspend functions compile correctly
  • Check for any Kotlin 2.0 compatibility warnings or errors

- Update Kotlin version to 2.0.21 in dependencies.gradle
- Update Room version to 2.6.1 for kapt compatibility with Kotlin 2.0
- Update Kotlin version in build.gradle
- Enable useBuildCache and mapDiagnosticLocations for better kapt performance
@sg-jsonjuliane sg-jsonjuliane changed the title Refactor/25084 kotlin upgrade Upgrade Kotlin to 2.0.21 in Stripe-dependent modules Jan 13, 2026
@sg-jsonjuliane sg-jsonjuliane self-assigned this Jan 13, 2026
@github-actions

This comment was marked as outdated.

- Add E : Any type parameter bounds to RxLifecycle extension functions for Kotlin 2.0 RxJava interop compatibility
- Fix type inference in QueryGeneratorImplTest by adding explicit type parameters
- Fix null safety in BaseUrlOverridingInterceptor to prevent NPE when baseUrlAdapter returns null
@sg-jsonjuliane sg-jsonjuliane force-pushed the refactor/25084-kotlin-upgrade branch from ef75de4 to 9cc4c49 Compare January 13, 2026 17:38
@github-actions
Copy link
Copy Markdown

✅ Unit tests passed successfully!

Test results are available under the "Artifacts" section of this run in GitHub Actions.

Please ensure the code is reviewed before proceeding with the merge.

@github-actions
Copy link
Copy Markdown

This pull request is stale because it has been open 5 days with no activity.

@github-actions github-actions Bot added the Stale label Jan 19, 2026
Copy link
Copy Markdown
Contributor

@MichaelReyes MichaelReyes left a comment

Choose a reason for hiding this comment

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

The changes look good. I also tested payments on both the Catch a Ride and ODIN WLs, and the payments went through successfully. Thanks.

@github-actions github-actions Bot removed the Stale label Jan 27, 2026
@sg-jsonjuliane sg-jsonjuliane merged commit 9efdd2e into develop Jan 27, 2026
1 check passed
@sg-jsonjuliane sg-jsonjuliane deleted the refactor/25084-kotlin-upgrade branch January 27, 2026 17:32
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