From 8671ef4f118a06b35624b39d591f0c9a9252e98d Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Sun, 11 Jun 2023 15:22:21 +0100 Subject: [PATCH 1/3] build: update branch aliases and tests for 4.x branch --- .github/workflows/tests.yml | 4 ++-- composer.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b2f8e99..0049b8a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Tests on: push: - branches: [ main, develop ] + branches: [ main, develop, 4.x ] pull_request: - branches: [ main, develop ] + branches: [ main, develop, 4.x ] jobs: build: diff --git a/composer.json b/composer.json index 52802c4..289fd34 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,8 @@ }, "extra": { "branch-alias": { - "dev-develop": "3.x-dev" + "dev-develop": "3.x-dev", + "dev-4.x": "4.x-dev" }, "laravel": { "providers": [ From ab1ca30b1250ed6a422f41e97e20a19a320c746d Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Sun, 11 Jun 2023 15:23:11 +0100 Subject: [PATCH 2/3] build(deps): update core package to v4 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 289fd34..2706d8c 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,8 @@ "ext-json": "*", "illuminate/contracts": "^10.0", "illuminate/support": "^10.0", - "laravel-json-api/core": "^3.0", - "laravel-json-api/neomerx-json-api": "^5.0.1" + "laravel-json-api/core": "^4.0", + "laravel-json-api/neomerx-json-api": "^5.0.2" }, "require-dev": { "phpunit/phpunit": "^9.5.28" @@ -54,7 +54,7 @@ ] } }, - "minimum-stability": "stable", + "minimum-stability": "dev", "prefer-stable": true, "config": { "sort-packages": true From e1cccaf5f50905d7927d335bad0b6eb25abb0c5b Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Fri, 9 Feb 2024 18:09:21 +0000 Subject: [PATCH 3/3] build: rename branch to next --- .github/workflows/tests.yml | 4 ++-- composer.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0049b8a..e12772a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Tests on: push: - branches: [ main, develop, 4.x ] + branches: [ main, develop, next ] pull_request: - branches: [ main, develop, 4.x ] + branches: [ main, develop, next ] jobs: build: diff --git a/composer.json b/composer.json index 2706d8c..75874c7 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "ext-json": "*", "illuminate/contracts": "^10.0", "illuminate/support": "^10.0", - "laravel-json-api/core": "^4.0", + "laravel-json-api/core": "^5.0", "laravel-json-api/neomerx-json-api": "^5.0.2" }, "require-dev": { @@ -46,7 +46,7 @@ "extra": { "branch-alias": { "dev-develop": "3.x-dev", - "dev-4.x": "4.x-dev" + "dev-next": "5.x-dev" }, "laravel": { "providers": [ pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy