From 207591688821954d4453cfd1f9b70ebd635f9402 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Thu, 4 Jul 2024 11:49:10 +0200 Subject: [PATCH] chore: set version in composer.json When running dump-autoload, then composer tries to find a matching version number. Sometimes the VCS detection does not work and the generated version number changes from the commit hash to the fallback and back to the generated version when someone else updates the package. We are now using a version number in composer.json to avoid a version number ping-pong. Signed-off-by: Daniel Kesselberg --- composer.json | 1 + composer.lock | 10 +++++----- composer/installed.php | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 5f1ea1604..177c663b1 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,6 @@ { "name": "nextcloud/3rdparty", + "version": "dev-master", "description": "All 3rdparty components", "license": "MIT", "config": { diff --git a/composer.lock b/composer.lock index a61a52d2a..c249521fc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4d14ded14d6eb8487843f729ca5ae46a", + "content-hash": "1122a291745dde5797d98832c2de4f9d", "packages": [ { "name": "aws/aws-crt-php", @@ -1568,12 +1568,12 @@ "version": "v5.2.13", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", + "url": "https://github.com/jsonrainbow/json-schema.git", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, @@ -1628,8 +1628,8 @@ "schema" ], "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + "issues": "https://github.com/jsonrainbow/json-schema/issues", + "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13" }, "time": "2023-09-26T02:20:38+00:00" }, diff --git a/composer/installed.php b/composer/installed.php index a48f6ccbf..a9110ae04 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'nextcloud/3rdparty', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '5d619fb1d9e9f28e5b6ceeef5fd59a85b1965e38', + 'reference' => NULL, 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(), @@ -292,7 +292,7 @@ 'nextcloud/3rdparty' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '5d619fb1d9e9f28e5b6ceeef5fd59a85b1965e38', + 'reference' => NULL, 'type' => 'library', 'install_path' => __DIR__ . '/../', 'aliases' => array(),