Skip to content

ADFA-2783: update templates to use compile/target SDK 36#994

Merged
itsaky-adfa merged 5 commits intostagefrom
fix/ADFA-2783
Feb 26, 2026
Merged

ADFA-2783: update templates to use compile/target SDK 36#994
itsaky-adfa merged 5 commits intostagefrom
fix/ADFA-2783

Conversation

@itsaky-adfa
Copy link
Contributor

@itsaky-adfa itsaky-adfa commented Feb 19, 2026

See ADFA-2783 for more details.

@itsaky-adfa itsaky-adfa requested a review from a team February 19, 2026 07:30
@itsaky-adfa itsaky-adfa self-assigned this Feb 19, 2026
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 19, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 34642a8 and b060d36.

📒 Files selected for processing (1)
  • common/src/main/java/com/itsaky/androidide/utils/Environment.java

📝 Walkthrough
  • New SDK enum constant: Baklava ("Baklava", "16", 36) added to Sdk.
  • Templates updated to use Baklava via constants:
    • TARGET_SDK_VERSION = Sdk.Baklava
    • COMPILE_SDK_VERSION = Sdk.Baklava
    • COMPOSE_SDK_VERSION = Sdk.Baklava
    • Template usages reference these constants in templates-api and templates-impl so generated projects will target API 36.
  • Environment path made dynamic:
    • ANDROID_JAR_HOME now uses ConstantsKt.getCOMPILE_SDK_VERSION().getApi() instead of hard-coded "33".
  • displayName() string formatting in Sdk changed to: "API $api: Android $version ($codename)" (minor interpolation/format change).

Risks / Best-practice concerns

  • Incomplete migration: code still references Tiramisu in several places and includes a Tiramisu-specific runtime flag:
    • layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/LayoutEditor.kt — isAtLeastTiramisu
    • layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/utils/FilePicker.kt — conditional using isAtLeastTiramisu
    • layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/utils/Constants.kt — Tiramisu-specific comments
    • Recommendation: review and update these checks/comments to reflect API 36 (Baklava) support or retain explicit Tiramisu checks only where API-specific behavior is required.
  • Display string change: although functionally equivalent, the modified displayName format could affect any tooling, tests, or UI that depend on exact string shape — verify consumers.
  • Dynamic ANDROID_JAR_HOME: computing platform path at runtime is better than a hard-coded value but may break environments that expect a specific installed platform; ensure CI and developer machines have Android platform 36 installed or add fallback handling.
  • Version consistency: confirm downstream modules, CI, Docker images, and template consumers are updated to support compile/target SDK 36 to avoid build or runtime incompatibilities.

Walkthrough

Introduces Sdk.Baklava (codename "Baklava", version "16", api 36), reformats Sdk primary constructor, adjusts Sdk.displayName formatting, updates TARGET/COMPILE/COMPOSE SDK constants to Sdk.Baklava, and makes Environment.java resolve android platform path dynamically from COMPILE_SDK_VERSION.api.

Changes

Cohort / File(s) Summary
SDK Constants Definition
composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/Sdk.kt
Added enum constant Baklava("Baklava", "16", 36); changed enum primary-constructor formatting to multi-line with trailing comma; modified displayName() string formatting to API $api: Android $version ($codename).
SDK Version Targeting
composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt
Replaced Sdk.Tiramisu with Sdk.Baklava for TARGET_SDK_VERSION, COMPILE_SDK_VERSION, and COMPOSE_SDK_VERSION.
Runtime Android path resolution
common/src/main/java/com/itsaky/androidide/utils/Environment.java
Replaced hard-coded "android-33" platform path with dynamic "/platforms/android-" + ConstantsKt.getCOMPILE_SDK_VERSION().getApi() and added import for org.adfa.constants.ConstantsKt.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Suggested reviewers

  • jatezzz

Poem

🐰 I hopped in code with whiskers bright,
Baklava added, shining light.
API thirty-six now on the shelf,
Paths updated — a rabbit's help for self. 🥮✨

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title 'ADFA-2783: update templates to use compile/target SDK 36' clearly and accurately summarizes the main changes in the pull request, which involve updating SDK constants and references from Tiramisu to Baklava (SDK 36).
Description check ✅ Passed The description references the associated Jira ticket ADFA-2783 and mentions updating templates to use compile/target SDK 36, which is directly related to the changeset.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
  • 📝 Generate docstrings (stacked PR)
  • 📝 Generate docstrings (commit on current branch)
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch fix/ADFA-2783

Tip

Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs).
Share your feedback on Discord.


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 and usage tips.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In
`@composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt`:
- Around line 24-26: Constants TARGET_SDK_VERSION / COMPILE_SDK_VERSION /
COMPOSE_SDK_VERSION are set to Sdk.Baklava (API 36) which forces edge-to-edge
behavior; update the generated Activity template (the class that currently
extends AppCompatActivity) to include edge-to-edge inset scaffolding by invoking
the existing helper (EdgeToEdgeUtils) or adding
WindowInsetsCompat/ViewCompat.setWindowInsetsAnimationCallback-based handling,
and also add a short migration comment in the generated build.gradle.kts or
Activity template explaining the API 36 behavior and reminding developers to
handle insets/resizability; ensure references to EdgeToEdgeUtils,
AppCompatActivity, and the build.gradle.kts/Activity template are updated so new
projects compile with proper inset handling.

@itsaky-adfa itsaky-adfa merged commit fba7682 into stage Feb 26, 2026
2 checks passed
@itsaky-adfa itsaky-adfa deleted the fix/ADFA-2783 branch February 26, 2026 16:54
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.

3 participants