Skip to content

chore(sync): merge upstream (resolve conflicts) - #9

Closed
Chloemlla wants to merge 1 commit into
advancedfrom
master
Closed

chore(sync): merge upstream (resolve conflicts)#9
Chloemlla wants to merge 1 commit into
advancedfrom
master

Conversation

@Chloemlla

@Chloemlla Chloemlla commented Aug 18, 2026 •
edited by coderabbitai Bot
Loading

Copy link
Copy Markdown
Owner

Manual conflict resolution of gradle.properties merge conflict

Summary by CodeRabbit

  • 版本更新
    • 将应用及相关组件版本从 2026.32 更新至 2026.33。

Janus
fix: resolve merge conflict in gradle.properties
502faef 
Keep upstream version bump (2026.33) while preserving the
proguard-version and vineflower-version lines from the advanced branch.
@vercel

vercel Bot commented Aug 18, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
eco-enchants Ready Ready Preview Aug 18, 2026 2:44pm

@coderabbitai

coderabbitai Bot commented Aug 18, 2026 •
edited
Loading

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 23d04eb5-3d7b-4315-a496-144eed3c3e96

📥 Commits

Reviewing files that changed from the base of the PR and between 90a5598 and 502faef.

📒 Files selected for processing (1)
  • gradle.properties

Included review availability: Your plan includes up to 1 review per rolling hour; 0 remain after this review.

📜 Recent review details
⏰ Context from checks skipped due to timeout. (1)
  • GitHub Check: Analyze (java-kotlin)
⚠️ CI failures not shown inline (2)

GitHub Actions: Build / build: chore(sync): merge upstream (resolve conflicts)

Conclusion: failure

View job details

##[group]Run ./gradlew build --full-stacktrace
 �[36;1m./gradlew build --full-stacktrace�[0m
 shell: /usr/bin/bash -e {0}
 env:
   JAVA_HOME: /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/25.0.4-7/x64
   JAVA_HOME_25_X64: /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/25.0.4-7/x64
   GRADLE_ACTION_ID: gradle/actions/setup-gradle
   GRADLE_USER_HOME: /home/runner/.gradle
   GRADLE_BUILD_ACTION_SETUP_COMPLETED: true
   GRADLE_BUILD_ACTION_CACHE_RESTORED: true
   DEVELOCITY_INJECTION_INIT_SCRIPT_NAME: gradle-actions.inject-develocity.init.gradle
   DEVELOCITY_INJECTION_CUSTOM_VALUE: gradle-actions
   GITHUB_DEPENDENCY_GRAPH_ENABLED: false
 ##[endgroup]
 Starting a Gradle Daemon (subsequent builds will be faster)
 > Task :cleanLibreforgeJar
 > Task :eco-core:core-nms:v1_21_8:clean UP-TO-DATE
 > Task :eco-core:core-plugin:clean UP-TO-DATE
 > Task :eco-core:core-nms:v1_21_10:clean UP-TO-DATE
 > Task :eco-core:core-nms:v1_21_10:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-core:core-nms:v1_21_8:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :clean UP-TO-DATE
 > Task :checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-core:core-plugin:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-core:core-nms:v1_21_11:clean UP-TO-DATE
 > Task :eco-core:core-nms:v1_21_11:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-core:core-nms:v1_21_8:paperweightUserdevSetup
 Skipping applyPaperclipPatch (up-to-date)
 Completed setup in 755ms
 Copied artifacts to project cache in 56ms
 > Task :eco-core:core-nms:v1_21_11:paperweightUserdevSetup
 Skipping applyPaperclipPatch (up-to-date)
 Completed setup in 770ms
 Copied artifacts to project cache in 96ms
 > Task :eco-core:core-nms:v1_21_8:processResources NO-SOURCE
 > Task :eco-core:core-nms:v1_21_11:processResources NO-SOURCE
 > Task :eco-core:core-nms:v26_1_1:clean UP-TO-DATE
 > Task :eco-core:core-nms:v26_1_1:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-...

GitHub Actions: Build / 0_build.txt: chore(sync): merge upstream (resolve conflicts)

Conclusion: failure

View job details

##[group]Run ./gradlew build --full-stacktrace
 �[36;1m./gradlew build --full-stacktrace�[0m
 shell: /usr/bin/bash -e {0}
 env:
   JAVA_HOME: /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/25.0.4-7/x64
   JAVA_HOME_25_X64: /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk/25.0.4-7/x64
   GRADLE_ACTION_ID: gradle/actions/setup-gradle
   GRADLE_USER_HOME: /home/runner/.gradle
   GRADLE_BUILD_ACTION_SETUP_COMPLETED: true
   GRADLE_BUILD_ACTION_CACHE_RESTORED: true
   DEVELOCITY_INJECTION_INIT_SCRIPT_NAME: gradle-actions.inject-develocity.init.gradle
   DEVELOCITY_INJECTION_CUSTOM_VALUE: gradle-actions
   GITHUB_DEPENDENCY_GRAPH_ENABLED: false
 ##[endgroup]
 Starting a Gradle Daemon (subsequent builds will be faster)
 > Task :cleanLibreforgeJar
 > Task :eco-core:core-nms:v1_21_8:clean UP-TO-DATE
 > Task :eco-core:core-plugin:clean UP-TO-DATE
 > Task :eco-core:core-nms:v1_21_10:clean UP-TO-DATE
 > Task :eco-core:core-nms:v1_21_10:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-core:core-nms:v1_21_8:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :clean UP-TO-DATE
 > Task :checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-core:core-plugin:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-core:core-nms:v1_21_11:clean UP-TO-DATE
 > Task :eco-core:core-nms:v1_21_11:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-core:core-nms:v1_21_8:paperweightUserdevSetup
 Skipping applyPaperclipPatch (up-to-date)
 Completed setup in 755ms
 Copied artifacts to project cache in 56ms
 > Task :eco-core:core-nms:v1_21_11:paperweightUserdevSetup
 Skipping applyPaperclipPatch (up-to-date)
 Completed setup in 770ms
 Copied artifacts to project cache in 96ms
 > Task :eco-core:core-nms:v1_21_8:processResources NO-SOURCE
 > Task :eco-core:core-nms:v1_21_11:processResources NO-SOURCE
 > Task :eco-core:core-nms:v26_1_1:clean UP-TO-DATE
 > Task :eco-core:core-nms:v26_1_1:checkKotlinGradlePluginConfigurationErrors SKIPPED
 > Task :eco-...
🔇 Additional comments (1)
gradle.properties (1)

3-3: LGTM!

Also applies to: 6-6, 10-10

📝 Walkthrough

Walkthrough

本次变更将 eco-version、libreforge-version 和项目 version 从 2026.32 更新为 2026.33。其他 Gradle 配置未改变。

Changes

版本更新

Layer / File(s) Summary
更新 Gradle 版本属性
gradle.properties		 将 eco-version、libreforge-version 和项目 version 更新为 2026.33。

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to 502fa

This is a localized Gradle properties conflict-resolution change, and no actionable merge-blocking risk remains beyond normal checks and review.

Suggested reviewers: exanthiax, callumjohnson

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed 标题明确说明了合并上游分支并解决冲突，与变更目标和手动修改 gradle.properties 的内容一致。
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches 💡 1
🛠️ Fix failing CI checks 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch master

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.

@Chloemlla

Chloemlla commented Aug 18, 2026

Copy link
Copy Markdown
Owner Author

Closing duplicate PR - conflict was already resolved and PR #8 merged.

@Chloemlla Chloemlla closed this Aug 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@coderabbitai coderabbitai[bot] coderabbitai[bot] approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Chloemlla