Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(deps): Add Nextcloud 28 support #394

Merged
merged 1 commit into from Jun 5, 2023
Merged

feat(deps): Add Nextcloud 28 support #394

merged 1 commit into from Jun 5, 2023

Conversation

nickvergessen
Copy link
Member

Signed-off-by: Joas Schilling coding@schilljs.com

@nickvergessen nickvergessen mentioned this pull request May 17, 2023
Closed
53 tasks
@nickvergessen @st3iny
feat(deps): Add Nextcloud 28 support
1432baf 
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
st3iny
st3iny approved these changes Jun 5, 2023
View reviewed changes
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

I also adjusted info.xml.

@st3iny st3iny added enhancement New feature or request 4. to release Ready to be released and/or waiting for tests to finish labels Jun 5, 2023
@st3iny st3iny added this to the 1.3.0 milestone Jun 5, 2023
@st3iny
Copy link
Member

st3iny commented Jun 5, 2023

🙃


  Problem 1
    - Root composer.json requires nextcloud/ocp dev-master -> satisfiable by nextcloud/ocp[dev-master].
    - nextcloud/ocp dev-master requires psr/container ^2.0.2 -> found psr/container[2.0.2] but the package is fixed to 1.1.1 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.

Use the option --with-all-dependencies (-W) to allow upgrades, downgrades and removals for packages currently locked to specific versions.
  Problem 1
    - Root composer.json requires nextcloud/ocp dev-master -> satisfiable by nextcloud/ocp[dev-master].
    - nextcloud/ocp dev-master requires psr/container ^2.0.2 -> found psr/container[2.0.2] but the package is fixed to 1.1.1 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.

Let's just force merge this to prevent getting stuck ...

@ChristophWurst
Copy link
Member

et's just force merge this to prevent getting stuck ...

nextcloud/mail#8515 ?

@st3iny
Copy link
Member

st3iny commented Jun 5, 2023

et's just force merge this to prevent getting stuck ...

nextcloud/mail#8515 ?

#395

@st3iny st3iny merged commit 807d87d into main Jun 5, 2023
25 of 30 checks passed
@st3iny st3iny deleted the update-main-version branch June 5, 2023 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@st3iny st3iny st3iny approved these changes

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement New feature or request
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nickvergessen @st3iny @ChristophWurst