23.0.0-dev

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

16 files changed, 82 insertions, 51 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3daf22a..0e09f08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-### 21.0.0
+
+### 23.0.0
+
+- better load of the libs
+
+
+### 20.0.1
 
 - compat nc21
 
diff --git a/Makefile b/Makefile
index e386f0b..5ca8dd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-app_name=fulltextsearch
+app_name=FullTextSearch
 
-project_dir=$(CURDIR)
 build_dir=$(CURDIR)/build/artifacts
 appstore_dir=$(build_dir)/appstore
 source_dir=$(build_dir)/source
@@ -8,49 +7,74 @@ sign_dir=$(build_dir)/sign
 package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
 github_account=nextcloud
+release_account=nextcloud-releases
 branch=master
-codecov_token_dir=$(HOME)/.nextcloud/codecov_token
-version+=21.0.0
+version=23.0.0-dev
+since_tag=21.0.1
 
 all: appstore
 
 release: appstore github-release github-upload
 
-dev-setup: clean composer
-
 github-release:
+	if [ -z "$(release_account)" ]; then \
+		release_account=$(github_account); \
+		release_branch=$(branch); \
+	else \
+		release_account=$(release_account); \
+		release_branch=master; \
+	fi; \
+	if [ -z "$(since_tag)" ]; then \
+		latest_tag=$$(git describe --tags `git rev-list --tags --max-count=1`); \
+	else \
+		latest_tag=$(since_tag); \
+	fi; \
+	comparison="$$latest_tag..HEAD"; \
+	if [ -z "$$latest_tag" ]; then comparison=""; fi; \
+	changelog=$$(git log $$comparison --oneline --no-merges | sed -e 's/^/$(github_account)\/$(app_name)@/'); \
 	github-release release \
-		--user $(github_account) \
+		--user $$release_account \
 		--repo $(app_name) \
-		--target $(branch) \
-		--tag v$(version) \
-		--name "$(app_name) v$(version)"
+		--target $$release_branch \
+		--tag $(version) \
+		--description "**Changelog**<br/>$$changelog" \
+		--name "$(app_name) v$(version)"; \
+	if [ $(github_account) != $$release_account ]; then \
+	        link="https://github.com/$$release_account/$(app_name)/releases/download/$(version)/$(app_name)-$(version).tar.gz";\
+		github-release release \
+			--user $(github_account) \
+			--repo $(app_name) \
+			--target $(branch) \
+			--tag $(version) \
+			--description "**Download**<br />$$link<br /><br />**Changelog**<br/>$$changelog<br />" \
+			--name "$(app_name) v$(version)"; \
+	fi; \
+
 
 github-upload:
+	if [ -z "$(release_account)" ]; then \
+		release_account=$(github_account); \
+	else \
+		release_account=$(release_account); \
+	fi; \
 	github-release upload \
-		--user $(github_account) \
+		--user $$release_account \
 		--repo $(app_name) \
-		--tag v$(version) \
+		--tag $(version) \
 		--name "$(app_name)-$(version).tar.gz" \
 		--file $(build_dir)/$(app_name)-$(version).tar.gz
 
+
 clean:
 	rm -rf $(build_dir)
 	rm -rf node_modules
-	rm -rf vendor
 
+# composer packages
 composer:
 	composer install --prefer-dist
-	composer update --prefer-dist
-
-test: SHELL:=/bin/bash
-test:
-	phpunit --coverage-clover=coverage.xml --configuration=tests/phpunit.xml tests
-	@if [ -f $(codecov_token_dir)/$(app_name) ]; then \
-		bash <(curl -s https://codecov.io/bash) -t @$(codecov_token_dir)/$(app_name) ; \
-	fi
+	composer upgrade --prefer-dist
 
-appstore: dev-setup
+appstore: clean composer
 	mkdir -p $(sign_dir)
 	rsync -a \
 	--exclude=/build \
@@ -60,18 +84,19 @@ appstore: dev-setup
 	--exclude=/tests \
 	--exclude=.git \
 	--exclude=/.github \
-	--exclude=/composer.json \
-	--exclude=/composer.lock \
 	--exclude=/l10n/l10n.pl \
 	--exclude=/CONTRIBUTING.md \
 	--exclude=/issue_template.md \
 	--exclude=/README.md \
+	--exclude=/composer.json \
+	--exclude=/testConfiguration.json \
+	--exclude=/composer.lock \
 	--exclude=/.gitattributes \
 	--exclude=/.gitignore \
 	--exclude=/.scrutinizer.yml \
 	--exclude=/.travis.yml \
 	--exclude=/Makefile \
-	$(project_dir)/ $(sign_dir)/$(app_name)
+	./ $(sign_dir)/$(app_name)
 	tar -czf $(build_dir)/$(app_name)-$(version).tar.gz \
 		-C $(sign_dir) $(app_name)
 	@if [ -f $(cert_dir)/$(app_name).key ]; then \
diff --git a/appinfo/info.xml b/appinfo/info.xml
index f8d16be..8d07c4d 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -10,7 +10,7 @@ Core App of the full-text search framework for your Nextcloud.
 
 ]]>
 	</description>
-	<version>21.0.0</version>
+	<version>23.0.0-dev</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
 	<namespace>FullTextSearch</namespace>
@@ -23,7 +23,7 @@ Core App of the full-text search framework for your Nextcloud.
 	<repository>https://github.com/nextcloud/fulltextsearch.git</repository>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/fulltextsearch/master/screenshots/0.3.0.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="21" max-version="21"/>
+		<nextcloud min-version="23" max-version="23"/>
 	</dependencies>
 
 	<background-jobs>
diff --git a/composer.json b/composer.json
index 95a2182..8253a43 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,6 @@
     }
   },
   "require": {
-    "daita/my-small-php-tools": "~22"
+    "artificial-owl/my-small-php-tools": "~23"
   }
 }
diff --git a/composer.lock b/composer.lock
index 4484dae..8ba1567 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9a74aaff9a9f470d6915232e517f88a5",
+    "content-hash": "b52d6a5c9fb9be09368e44333c380806",
     "packages": [
         {
-            "name": "daita/my-small-php-tools",
-            "version": "v22.0.3",
+            "name": "artificial-owl/my-small-php-tools",
+            "version": "v23.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/daita/my-small-php-tools.git",
-                "reference": "5a6c67be6f76955f44651fba8ebad9e6f9216acc"
+                "url": "https://github.com/ArtificialOwl/my-small-php-tools.git",
+                "reference": "f6141b8d572dc11fe73db99d37f8fd3389550eec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/5a6c67be6f76955f44651fba8ebad9e6f9216acc",
-                "reference": "5a6c67be6f76955f44651fba8ebad9e6f9216acc",
+                "url": "https://api.github.com/repos/ArtificialOwl/my-small-php-tools/zipball/f6141b8d572dc11fe73db99d37f8fd3389550eec",
+                "reference": "f6141b8d572dc11fe73db99d37f8fd3389550eec",
                 "shasum": ""
             },
             "require": {
@@ -26,7 +26,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "daita\\MySmallPhpTools\\": "lib/"
+                    "ArtificialOwl\\MySmallPhpTools\\": "lib/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -41,10 +41,10 @@
             ],
             "description": "My small PHP Tools",
             "support": {
-                "issues": "https://github.com/daita/my-small-php-tools/issues",
-                "source": "https://github.com/daita/my-small-php-tools/tree/v22.0.3"
+                "issues": "https://github.com/ArtificialOwl/my-small-php-tools/issues",
+                "source": "https://github.com/ArtificialOwl/my-small-php-tools/tree/v23.0.1"
             },
-            "time": "2021-05-04T18:18:55+00:00"
+            "time": "2021-07-11T13:19:33+00:00"
         }
     ],
     "packages-dev": [],
diff --git a/lib/Command/Index.php b/lib/Command/Index.php
index 3ca084b..d0f7132 100644
--- a/lib/Command/Index.php
+++ b/lib/Command/Index.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Command;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
 use OC\Core\Command\InterruptedException;
 use OCA\FullTextSearch\ACommandBase;
diff --git a/lib/Command/Live.php b/lib/Command/Live.php
index 1a26a3d..ee63ac0 100644
--- a/lib/Command/Live.php
+++ b/lib/Command/Live.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Command;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
 use OC\Core\Command\InterruptedException;
 use OCA\FullTextSearch\ACommandBase;
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index d3c2316..6fd86cf 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Controller;
 
 
-use daita\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse;
+use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse;
 use Exception;
 use OCA\FullTextSearch\AppInfo\Application;
 use OCA\FullTextSearch\Model\SearchRequest;
diff --git a/lib/Db/IndexesRequestBuilder.php b/lib/Db/IndexesRequestBuilder.php
index 3baeb44..d81df09 100644
--- a/lib/Db/IndexesRequestBuilder.php
+++ b/lib/Db/IndexesRequestBuilder.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Db;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use OCA\FullTextSearch\Model\Index;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
diff --git a/lib/Db/TickRequestBuilder.php b/lib/Db/TickRequestBuilder.php
index ee52b20..81cdd0d 100644
--- a/lib/Db/TickRequestBuilder.php
+++ b/lib/Db/TickRequestBuilder.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Db;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use OCA\FullTextSearch\Model\Tick;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
diff --git a/lib/Model/Index.php b/lib/Model/Index.php
index dd25e68..a324fff 100644
--- a/lib/Model/Index.php
+++ b/lib/Model/Index.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Model;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use JsonSerializable;
 use OCP\FullTextSearch\Model\IIndex;
 
diff --git a/lib/Model/IndexOptions.php b/lib/Model/IndexOptions.php
index e5fdd25..6d54876 100644
--- a/lib/Model/IndexOptions.php
+++ b/lib/Model/IndexOptions.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Model;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use JsonSerializable;
 use OCP\FullTextSearch\Model\IIndexOptions;
 
diff --git a/lib/Model/Runner.php b/lib/Model/Runner.php
index b0c82dd..f09075e 100644
--- a/lib/Model/Runner.php
+++ b/lib/Model/Runner.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Model;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
 use OCA\FullTextSearch\ACommandBase;
 use OCA\FullTextSearch\Exceptions\RunnerAlreadyUpException;
diff --git a/lib/Model/SearchRequest.php b/lib/Model/SearchRequest.php
index ab07e55..c56a5e2 100644
--- a/lib/Model/SearchRequest.php
+++ b/lib/Model/SearchRequest.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Model;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use JsonSerializable;
 use OCP\FullTextSearch\Model\ISearchRequest;
 use OCP\FullTextSearch\Model\ISearchRequestSimpleQuery;
diff --git a/lib/Model/Tick.php b/lib/Model/Tick.php
index 3a9efc2..fada00a 100644
--- a/lib/Model/Tick.php
+++ b/lib/Model/Tick.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Model;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 
 /**
  * Class Tick
diff --git a/lib/Search/UnifiedSearchProvider.php b/lib/Search/UnifiedSearchProvider.php
index c2e908e..70cf72e 100644
--- a/lib/Search/UnifiedSearchProvider.php
+++ b/lib/Search/UnifiedSearchProvider.php
@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\FullTextSearch\Search;
 
 
-use daita\MySmallPhpTools\Traits\TArrayTools;
+use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
 use OCA\FullTextSearch\Model\SearchRequest;
 use OCA\FullTextSearch\Service\ConfigService;