Skip to content

Commit

Permalink
Compatibility with Kirby 3.6
Browse files Browse the repository at this point in the history
Closes #6.

Co-authored-by: Bastian Allgeier <[email protected]>
  • Loading branch information
lukasbestle and bastianallgeier committed Oct 2, 2021
1 parent cf36829 commit 90a4791
Show file tree
Hide file tree
Showing 16 changed files with 1,661 additions and 18,635 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Versions for Kirby 3

[![Kirby 3.5.5+](https://img.shields.io/badge/Kirby-3.5.5%2B-green)](https://getkirby.com)
[![Kirby 3.6.0+](https://img.shields.io/badge/Kirby-3.6.0%2B-green)](https://getkirby.com)
[![MIT license](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.md)
[![Release](https://img.shields.io/github/v/release/lukasbestle/kirby-versions)](https://github.com/lukasbestle/kirby-versions/releases/latest)
[![CI Status](https://img.shields.io/github/workflow/status/lukasbestle/kirby-versions/CI?label=CI)](https://github.com/lukasbestle/kirby-versions/actions?query=workflow%3ACI)
Expand Down Expand Up @@ -48,11 +48,13 @@

## Requirements

- Kirby 3.5.5+
- Kirby 3.6.0+
- Git 2.5+ (ideally newer for better reliability)

**Note:** Deploying versions to multiple sites currently only works if all sites are hosted on the same server (i.e. if Kirby has access to the file system of all sites).

Kirby 3.5.5+ is supported by version 1.0.0 of this plugin.

## Installation

### Download
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"require": {
"php": ">=7.3.0 <8.1.0",
"getkirby/cms": ">=3.5.5 <3.6.0",
"getkirby/cms": ">=3.6.0-beta.2 <3.7.0",
"getkirby/composer-installer": "^1.1"
},
"extra": {
Expand Down
60 changes: 31 additions & 29 deletions composer.lock

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

5 changes: 3 additions & 2 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
if (
$kirbyVersion !== null &&
(
version_compare($kirbyVersion, '3.5.5', '<') === true ||
version_compare($kirbyVersion, '3.6.0-alpha', '>=') === true
version_compare($kirbyVersion, '3.6.0-alpha', '<') === true ||
version_compare($kirbyVersion, '3.7.0-alpha', '>=') === true
)
) {
throw new Exception(
Expand All @@ -44,6 +44,7 @@
// register the plugin
App::plugin('lukasbestle/versions', [
'api' => require __DIR__ . '/src/config/api.php',
'areas' => require __DIR__ . '/src/config/areas.php',
'hooks' => require __DIR__ . '/src/config/hooks.php',
'options' => require __DIR__ . '/src/config/options.php',
'permissions' => require __DIR__ . '/src/config/permissions.php',
Expand Down
Loading

0 comments on commit 90a4791

Please sign in to comment.