-
-
Notifications
You must be signed in to change notification settings - Fork 6
Incorporate latest main branch and update SDK to API level 36 #202
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
75py
merged 14 commits into
update-dependencies
from
copilot/fix-4ad095cd-85b1-49f9-8703-1d98b82f5809
Aug 24, 2025
Merged
Incorporate latest main branch and update SDK to API level 36 #202
75py
merged 14 commits into
update-dependencies
from
copilot/fix-4ad095cd-85b1-49f9-8703-1d98b82f5809
Aug 24, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: 75py <3153211+75py@users.noreply.github.com>
Co-authored-by: 75py <3153211+75py@users.noreply.github.com>
Co-authored-by: 75py <3153211+75py@users.noreply.github.com>
Co-authored-by: 75py <3153211+75py@users.noreply.github.com>
…-a34f49738069 Fix GitHub Actions workflow cache conflicts and update deprecated actions to latest versions
…nt project Co-authored-by: 75py <3153211+75py@users.noreply.github.com>
…-bb683a7a03e6 Add comprehensive GitHub Copilot instructions for DebugAssistant project
…ard rules, and Gradle wrapper
…d Compose compiler plugin Co-authored-by: 75py <3153211+75py@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] 最新のmainブランチを取り込んで
Incorporate latest main branch: update dependencies, SDK versions, and build configuration
Aug 24, 2025
75py
reviewed
Aug 24, 2025
Owner
75py
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@copilot ついでに、compileSdkを36にあげてくれる?
Owner
|
@copilot ついでに、compileSdkとtargetSdkを36にあげてくれる? |
Co-authored-by: 75py <3153211+75py@users.noreply.github.com>
Contributor
Author
Copilot
AI
changed the title
Incorporate latest main branch: update dependencies, SDK versions, and build configuration
Incorporate latest main branch and update SDK to API level 36
Aug 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR incorporates the latest changes from the main branch into the current working branch, addressing the Japanese request "最新のmainブランチを取り込んで" (incorporate the latest main branch), and updates the Android SDK configuration to API level 36.
Changes Made
Dependencies and Build System Updates
core-ktx: 1.10.1 → 1.16.0lifecycle-runtime-ktx: 2.6.1 → 2.9.2activity-compose: 1.7.2 → 1.10.1Android SDK Configuration
compileSdkandtargetSdkfrom 34 to 36 across all Android modules:app/build.gradle)data/repository/build.gradle)domain/usecase/build.gradle)Build Configuration
org.jetbrains.kotlin.plugin.composeplugin to support Kotlin 2.2.10GitHub Actions Improvements
actions/checkoutfrom v2 to v4actions/setup-javafrom v2 to v4Code Quality
com.google.errorprone.annotations.Immutablewarnings.github/copilot-instructions.mdfor project guidanceMerge Conflict Resolution
This PR resolved multiple merge conflicts that occurred due to unrelated histories between branches:
build.gradle,app/build.gradle, etc.)android.yml)All conflicts were resolved by choosing the most up-to-date dependency versions while ensuring compatibility.
Verification
./gradlew assembleDebug./gradlew testDebugUnitTestThe project now incorporates all the latest improvements from the main branch with the most current Android SDK target while maintaining full functionality and test coverage.
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.