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.

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

Release 20250313 #117

Merged
merged 4 commits into from
Mar 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ cert_directory=$(HOME)/.nextcloud/certificates

all: dev-setup lint build-js-production

release: npm-init build-js-production build-tarball
release: composer npm-init build-js-production build-tarball

appstore: npm-init build-js-production build-appstore-tarball
appstore: composer npm-init build-js-production build-appstore-tarball

dev-setup: clean-dev composer npm-init

Expand Down Expand Up @@ -91,8 +91,8 @@ build-tarball:
--exclude="dev-environment" \
--exclude="docker" \
--exclude="node_modules" \
--exclude="src" \
--exclude="vendor" \
--exclude="./src" \
--exclude="./vendor" \
--exclude=".editorconfig" \
--exclude=".eslintrc.js" \
--exclude=".gitignore" \
Expand All @@ -109,6 +109,7 @@ build-tarball:
--exclude="package.json" \
--exclude="stylelint.config.js" \
--exclude="webpack.config.js" \
--exclude="CHANGELOG.md" \
../$(app_name)/ $(temp_build_directory)/$(app_id)
tar czf $(build_directory)/$(app_name).tar.gz \
-C $(temp_build_directory) $(app_id)
Expand All @@ -126,8 +127,8 @@ build-appstore-tarball:
--exclude="dev-environment" \
--exclude="docker" \
--exclude="node_modules" \
--exclude="src" \
--exclude="vendor" \
--exclude="./src" \
--exclude="./vendor" \
--exclude=".editorconfig" \
--exclude=".eslintrc.js" \
--exclude=".gitignore" \
Expand All @@ -144,6 +145,7 @@ build-appstore-tarball:
--exclude="package.json" \
--exclude="stylelint.config.js" \
--exclude="webpack.config.js" \
--exclude="CHANGELOG.md" \
../$(app_id)/ $(temp_build_directory)/$(app_id)
@if [ -f $(cert_directory)/$(app_id).key ]; then \
echo "Signing app files…"; \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This plugin integrates [Swarm](https://www.ethswarm.org/) (a decentralized, bloc

Before using the plugin, ensure you have the following:

- An active Nextcloud instance (version 27,28 or 29)
- An active Nextcloud instance (version 29,30 or 31)
- A valid license and URL to activate the service
- [Request Your Free Nextcloud Swarm Plugin Trial License](https://metaprovide.org/hejbit/start)

Expand Down
10 changes: 7 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This plugin integrates [Swarm](https://www.ethswarm.org/) (a decentralized, bloc

Before using the plugin, ensure you have the following:

- An active Nextcloud instance (version 28,29 or 30)
- An active Nextcloud instance (version 29,30 or 31)
- A valid license and URL to activate the service
- [Request Your Free Nextcloud Swarm Plugin Trial License](https://metaprovide.org/hejbit/start)

Expand Down Expand Up @@ -71,7 +71,7 @@ Experience the future of data storage with 5GB of free, decentralized storage on

[Get your free licence here!](https://metaprovide.org/hejbit/start)
]]></description>
<version>0.5.11</version>
<version>0.5.12</version>
<licence>agpl</licence>
<author>MetaProvide</author>
<namespace>Files_External_Ethswarm</namespace>
Expand All @@ -86,8 +86,12 @@ Experience the future of data storage with 5GB of free, decentralized storage on
<repository type="git">https://github.com/MetaProvide/nextcloud-swarm-plugin.git</repository>
<screenshot>https://raw.githubusercontent.com/MetaProvide/nextcloud-swarm-plugin/main/assets/images/swarm_Files.png</screenshot>
<dependencies>
<nextcloud min-version="28" max-version="30"/>
<nextcloud min-version="29" max-version="31"/>
</dependencies>
<settings>
<admin>OCA\Files_External_Ethswarm\Settings\Admin</admin>
<admin-section>OCA\Files_External_Ethswarm\Settings\Section</admin-section>
</settings>
<sabre>
<plugins>
<plugin>OCA\Files_External_Ethswarm\Sabre\PropfindPlugin</plugin>
Expand Down
55 changes: 29 additions & 26 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,33 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
return ['routes' => [
[
'name' => 'Settings#save',
'url' => '/save',
'verb' => 'POST',
],
[
'name' => 'Bee#createPostageBatch',
'url' => '/bee/createPostageBatch',
'verb' => 'POST',
],
[
'name' => 'Bee#verifyBeeNodeAccess',
'url' => '/bee/verifyBeeNodeAccess',
'verb' => 'POST',
],
[
'name' => 'Bee#topUpBatch',
'url' => '/bee/topUpBatch',
'verb' => 'POST',
],
[
'name' => 'Feedback#submit',
'url' => '/feedback/submit',
'verb' => 'POST',

return [
'routes' => [
[
'name' => 'Settings#save',
'url' => '/settings',
'verb' => 'POST',
],
[
'name' => 'Bee#createPostageBatch',
'url' => '/bee/createPostageBatch',
'verb' => 'POST',
],
[
'name' => 'Bee#verifyBeeNodeAccess',
'url' => '/bee/verifyBeeNodeAccess',
'verb' => 'POST',
],
[
'name' => 'Bee#topUpBatch',
'url' => '/bee/topUpBatch',
'verb' => 'POST',
],
[
'name' => 'Feedback#submit',
'url' => '/feedback/submit',
'verb' => 'POST',
],
],
]];
];
2 changes: 1 addition & 1 deletion cli/staging/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ log_gap

DEPLOYMENT=()
TIMESTAMP=$(date +%s)
for version in {28..30}; do
for version in {29..31}; do
deploy "$version" &
DEPLOYMENT+=($!)
done
Expand Down
23 changes: 21 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,29 @@
"require-dev": {
"nextcloud/coding-standard": "^1.3.2",
"ext-fileinfo": "*",
"friendsofphp/php-cs-fixer": "*"
"friendsofphp/php-cs-fixer": "*",
"bamarni/composer-bin-plugin": "^1.8"
},
"scripts": {
"cs:check": "./vendor/php-cs-fixer/shim/php-cs-fixer.phar fix --dry-run --diff",
"cs:fix": "./vendor/php-cs-fixer/shim/php-cs-fixer.phar fix"
"cs:fix": "./vendor/php-cs-fixer/shim/php-cs-fixer.phar fix",
"post-install-cmd": [
"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all install --ansi"
],
"post-update-cmd": [
"[ $COMPOSER_DEV_MODE -eq 0 ] || composer bin all update --ansi"
]
},
"config": {
"allow-plugins": {
"php-http/discovery": true,
"bamarni/composer-bin-plugin": true
}
},
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": true
}
}
}
59 changes: 58 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading