Skip to content

Conversation

Copy link
Contributor

Copilot AI commented Aug 24, 2025

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

  • Android Gradle Plugin: Updated from 8.1.2 to 8.8.0/8.9.2
  • Kotlin: Updated from 1.8.22/1.9.0 to 2.2.10 across all modules
  • Compose: Updated from 1.5.0 to 1.8.0
  • AndroidX Libraries: Updated to latest versions including:
    • core-ktx: 1.10.1 → 1.16.0
    • lifecycle-runtime-ktx: 2.6.1 → 2.9.2
    • activity-compose: 1.7.2 → 1.10.1
    • Various testing libraries updated to latest versions
  • Koin: Updated from 3.4.3 to 3.5.6
  • MockK: Updated from 1.12.3/1.13.7 to 1.14.0

Android SDK Configuration

  • SDK Versions: Updated compileSdk and targetSdk from 34 to 36 across all Android modules:
    • Main app module (app/build.gradle)
    • Data repository module (data/repository/build.gradle)
    • Domain usecase module (domain/usecase/build.gradle)

Build Configuration

  • Gradle Wrapper: Updated from 8.3 to 8.11.1 for compatibility with newer Android Gradle Plugin
  • Compose Compiler Plugin: Added org.jetbrains.kotlin.plugin.compose plugin to support Kotlin 2.2.10
  • Kotlin Compiler Extensions: Updated versions across all modules

GitHub Actions Improvements

  • Updated actions/checkout from v2 to v4
  • Updated actions/setup-java from v2 to v4
  • Removed redundant cache configuration (now handled automatically by setup-java)
  • Improved workflow efficiency and reliability

Code Quality

  • ProGuard Rules: Added suppression for com.google.errorprone.annotations.Immutable warnings
  • Documentation: Added comprehensive .github/copilot-instructions.md for project guidance

Merge Conflict Resolution

This PR resolved multiple merge conflicts that occurred due to unrelated histories between branches:

  • Build configuration files (build.gradle, app/build.gradle, etc.)
  • GitHub Actions workflow (android.yml)
  • ProGuard rules
  • Gradle wrapper configuration

All conflicts were resolved by choosing the most up-to-date dependency versions while ensuring compatibility.

Verification

  • ✅ Project builds successfully with ./gradlew assembleDebug
  • ✅ All unit tests pass with ./gradlew testDebugUnitTest
  • ✅ Updated SDK versions (API level 36) properly support all current dependencies
  • ✅ Gradle wrapper updated to support newer Android Gradle Plugin versions

The 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.

75py and others added 11 commits October 9, 2023 16:23
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
Copilot AI and others added 2 commits August 24, 2025 04:41
…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
Copilot AI requested a review from 75py August 24, 2025 04:51
Copy link
Owner

@75py 75py left a comment

Choose a reason for hiding this comment

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

@copilot ついでに、compileSdkを36にあげてくれる?

@75py
Copy link
Owner

75py commented Aug 24, 2025

@copilot ついでに、compileSdkとtargetSdkを36にあげてくれる?

Co-authored-by: 75py <3153211+75py@users.noreply.github.com>
Copy link
Contributor Author

Copilot AI commented Aug 24, 2025

@copilot ついでに、compileSdkとtargetSdkを36にあげてくれる?

Updated both compileSdk and targetSdk to 36 across all Android modules (app, data/repository, domain/usecase). Build verified successful. Commit: 4f18bb7

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
@75py 75py marked this pull request as ready for review August 24, 2025 05:34
@75py 75py merged commit d8f2338 into update-dependencies Aug 24, 2025
@75py 75py deleted the copilot/fix-4ad095cd-85b1-49f9-8703-1d98b82f5809 branch August 24, 2025 05:34
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