Merge pull request #18 from timohund/task/master/17-prepare-release-o…

…f-version-2 [TASK] Prepare version 2.0.0 of solrfluidgrouping
TYPO3-Solr · Feb 15, 2019 · 5686827 · 5686827
2 parents 5ab1e85 + 03c6a81
commit 5686827
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 179 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 sudo: true
 
@@ -16,19 +17,30 @@ env:
     - TYPO3_DATABASE_HOST="localhost"
     - TYPO3_DATABASE_USERNAME="root"
     - TYPO3_DATABASE_PASSWORD=""
-    - EXT_SOLR_VERSION="dev-master"
+    - EXT_SOLR_VERSION="dev-release-9.0.x"
   matrix:
-    - TYPO3_VERSION="^8.7"
-    - TYPO3_VERSION="8.x-dev"
-    - TYPO3_VERSION="9.x-dev"
+    - TYPO3_VERSION="^8.7.0"
+    - TYPO3_VERSION="^9.5.0"
+    - TYPO3_VERSION="dev-master"
 
 matrix:
   fast_finish: true
   allow_failures:
-    - env: TYPO3_VERSION="9.x-dev"
-      php: 7.0
-    - env: TYPO3_VERSION="9.x-dev"
+    - env: TYPO3_VERSION="dev-master"
+      php: 7.2
+    - env: TYPO3_VERSION="dev-master"
       php: 7.1
+    - env: TYPO3_VERSION="dev-master"
+      php: 7.0
+  exclude:
+    - php: 7.0
+      env: TYPO3_VERSION="^9.5.0"
+    - php: 7.1
+      env: TYPO3_VERSION="^9.5.0"
+    - php: 7.1
+      env: TYPO3_VERSION="dev-master"
+    - php: 7.0
+      env: TYPO3_VERSION="dev-master"
 
 before_install:
   - composer self-update

diff --git a/Build/Test/bootstrap.sh b/Build/Test/bootstrap.sh
@@ -53,7 +53,12 @@ echo "Using extension path $EXTENSION_ROOTPATH"
 echo "Using package path $TYPO3_PATH_PACKAGES"
 echo "Using web path $TYPO3_PATH_WEB"
 
-composer require --dev typo3/cms="$TYPO3_VERSION"
+if [[ $TYPO3_VERSION = *"master"*  || $TYPO3_VERSION = *"9"* ]]; then
+    composer require --dev --update-with-dependencies typo3/cms-core="$TYPO3_VERSION" typo3/cms-backend="$TYPO3_VERSION" typo3/cms-fluid="$TYPO3_VERSION" typo3/cms-frontend="$TYPO3_VERSION" typo3/cms-extbase="$TYPO3_VERSION" typo3/cms-reports="$TYPO3_VERSION" typo3/cms-scheduler="$TYPO3_VERSION" typo3/cms-tstemplate="$TYPO3_VERSION"
+else
+    composer require --dev typo3/cms="$TYPO3_VERSION"
+fi
+
 composer require --dev apache-solr-for-typo3/solr="$EXT_SOLR_VERSION"
 
 # Restore composer.json

diff --git a/Documentation/Configuration/Index.rst b/Documentation/Configuration/Index.rst
diff --git a/Documentation/Configuration/Reference/TxSolrGrouping.rst b/Documentation/Configuration/Reference/TxSolrGrouping.rst
diff --git a/Documentation/Introduction/Index.rst b/Documentation/Introduction/Index.rst
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -1,10 +1,10 @@
 [general]
 
 project     = ApacheSolrForTypo3 EXT:solrfluidgrouping
-version     = 2.0.0-dev
-release     = 2.0.0-dev
+version     = 2.0.0
+release     = 2.0.0
 t3author    = Timo Hund
-copyright   = 2018
+copyright   = 2019
 
 description = Documentation for EXT:solrfluidgrouping grouping for fluid templating
 

diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml
@@ -4,10 +4,10 @@
 
 ---
 conf.py:
-  copyright: 2018
+  copyright: 2019
   project: Documentation for EXT:solrfluidgrouping grouping for solr results
-  version: 2.0.0-dev
-  release: 2.0.0-dev
+  version: 2.0.0
+  release: 2.0.0
   extensions:
     - sphinx.ext.intersphinx
     - t3sphinx.ext.t3extras

diff --git a/Documentation/conf.py b/Documentation/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.0-dev'
+version = '2.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.0-dev'
+release = '2.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/Documentation/solrfluidgrouping.pdf b/Documentation/solrfluidgrouping.pdf
diff --git a/composer.json b/composer.json
@@ -26,11 +26,10 @@
     "typo3/cms-core": ">=8.7.0"
   },
   "require-dev": {
-    "phpunit/phpunit": ">=4.8.0 <6.0.0",
-    "nimut/testing-framework": "^1.1"
+    "phpunit/phpunit": "6.0.0",
+    "nimut/testing-framework": "^4.0.0"
   },
   "replace": {
-    "solrfluidgrouping": "self.version",
     "typo3-ter/solrfluidgrouping": "self.version"
   },
   "autoload": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -2,7 +2,7 @@
 $EM_CONF[$_EXTKEY] = array(
     'title' => 'Apache Solr for TYPO3 - Grouping for fluid rendering',
     'description' => 'This addon provides the grouping for the fluid templating',
-    'version' => '2.0.0-dev',
+    'version' => '2.0.0',
     'state' => 'stable',
     'category' => 'plugin',
     'author' => 'Timo Hund, Frans Saris',
@@ -17,9 +17,9 @@
         'depends' => array(
             'scheduler' => '',
             'solr' => '9.0.0-',
-            'extbase' => '8.7.0-9.3.99',
-            'fluid' => '8.7.0-9.3.99',
-            'typo3' => '8.7.0-9.3.99'
+            'extbase' => '8.7.0-9.5.99',
+            'fluid' => '8.7.0-9.5.99',
+            'typo3' => '8.7.0-9.5.99'
         ),
         'conflicts' => array(),
         'suggests' => array(