Repository navigation
Commit a8a0448
committed
Merge stage into task/ADFA-2602-toolchain-agp9
Brings the branch up to date with stage (38 commits) to clear the merge
conflict on the PR.
One conflict, in app/build.gradle.kts: both sides added imports at the same
point in the block. Kept both sets. The branch needs
GRADLE_API_NAME_JAR_BR / GRADLE_API_NAME_JAR_ZIP /
GRADLE_DISTRIBUTION_ARCHIVE_NAME for the toolchain version constants, and stage
needs DefaultNativePlatform; all four are still referenced after the merge.
constants.kt and gradle/libs.versions.toml auto-merged and were checked by hand:
the on-device toolchain stays at AGP 9.3.1 / Gradle 9.6.1 / Kotlin 2.3.21, and
agp-tooling stays 9.3.1.
Verified with `./gradlew :app:help --offline` on the merged tree.
Claude-Session: https://claude.ai/code/session_017HGpMsUzZ5wxCfMtDZ2HGP279 files changed
Lines changed: 32742 additions & 8535 deletions
File tree
- .claude/skills/architecture-review
- .github/workflows
- actions
- src
- main/java/com/itsaky/androidide/actions
- test/java/com/itsaky/androidide/actions
- apk-viewer-plugin/src/main/res/values-in
- app
- src
- androidTest/kotlin/com/itsaky/androidide/helper
- main
- java/com/itsaky/androidide
- actions
- filetree
- file
- activities
- editor
- adapters
- analytics
- app
- di
- dnd
- fragments
- onboarding
- output
- handlers
- localWebServer
- logs
- lsp
- preferences
- repositories
- roomData/recentproject
- templates/manager
- models
- parsing
- ui
- compose
- common
- plugins
- templates
- theme
- models
- utils
- viewmodels
- viewmodel
- res
- layout
- values-in
- test/java/com/itsaky/androidide
- analytics
- app
- assets
- handlers
- localWebServer
- logs
- lsp
- preferences
- repositories
- templates/manager
- models
- parsing
- viewmodels
- viewmodel
- assets
- build-info
- src/main/java/com/itsaky/androidide/buildinfo
- common-compose
- src
- main/java/com/itsaky/androidide/common/compose
- test/java/com/itsaky/androidide/common/compose
- common/src
- androidTest/java/com/itsaky/androidide/utils
- main/java/com/itsaky/androidide
- templates
- utils
- test/java/com/itsaky/androidide/utils
- composite-builds
- build-deps-common/constants/src/main/java/org/adfa/constants
- build-logic/common/src/main/java/com/itsaky/androidide/build/config
- docs
- adr
- features
- process
- superpowers
- plans
- specs
- editor/src/main/java/com/itsaky/androidide/editor/ui
- floating-window
- src/main/java/com/itsaky/androidide/floating/ui
- gradle
- idetooltips
- src/main/java/com/itsaky/androidide/idetooltips
- infra/well-known-worker
- src
- logsender/src/main/res/values-in
- lsp
- api/src
- main/java/com/itsaky/androidide/lsp/actions
- test/java/com/itsaky/androidide/lsp/actions
- java/src
- main/java/com/itsaky/androidide/lsp/java/actions
- diagnostics
- generators
- test/java/com/itsaky/androidide/lsp/java/actions
- kotlin
- src
- main/java/com/itsaky/androidide/lsp/kotlin
- actions
- compiler
- modules
- services
- refactor/ui
- utils/refactor
- test/java/com/itsaky/androidide/lsp/kotlin
- compiler/modules
- refactor/ui
- utils
- refactor
- markdown-preview-plugin/src/main/res/values-in
- plugin-api
- api
- src
- main
- java/com/itsaky/androidide/plugins/services
- kotlin/com/itsaky/androidide/plugins/services
- test
- java/com/itsaky/androidide/plugins/services
- kotlin/com/itsaky/androidide/plugins
- plugin-manager/src/main/kotlin/com/itsaky/androidide/plugins/manager
- core
- services
- preferences/src/main/java/com/itsaky/androidide/preferences/internal
- profiler
- src/main/java/org/appdevforall/cotg/profiler/ui/theme
- resources/src/main/res
- drawable
- values-ar-rSA
- values-bn-rIN
- values-de-rDE
- values-es-rES
- values-fr-rFR
- values-hi-rIN
- values-in-rID
- values-pt-rBR
- values-ro-rRO
- values-ru-rRU
- values-tr-rTR
- values-zh-rCN
- values
- scripts/r8-plugin-impact
- subprojects/tooling-api-model
- templates-api/src/main/java/com/itsaky/androidide/templates
- templates-impl/src
- main/java/com/itsaky/androidide/templates/impl
- test/java/com/itsaky/androidide/templates
- testing/resources/test-project/.cg/gradle-sync
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| 59 | + | |
59 | 60 | | |
60 | | - | |
| 61 | + | |
61 | 62 | | |
62 | 63 | | |
63 | 64 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
0 commit comments