Skip to content

Commit

Permalink
Merge branch 'release/4.0.0' into v4
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed May 10, 2022
2 parents bc5aea1 + 6b23a17 commit 00146c6
Show file tree
Hide file tree
Showing 10 changed files with 355 additions and 314 deletions.
16 changes: 16 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Do not export those files in the Composer archive (lighter dependency)
/.craftplugin export-ignore
/.gitattributes export-ignore
/.github/ export-ignore
/.gitignore export-ignore
/.scrutinizer.yml export-ignore
/codeception.yml export-ignore
/composer.lock export-ignore
/buildchain/ export-ignore
/docs/ export-ignore
/src/web/assets/public/
/src/web/assets/src/
/tests/ export-ignore

# Auto detect text files and perform LF normalization
* text=auto
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @khalwat
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Cookies Changelog

## 4.0.0 - 2022.05.10
### Added
* Initial Craft CMS 4 release

### Fixed
* Fixed an issue where `sameSite` must be of type boolean ([#37](https://github.com/nystudio107/craft-cookies/issues/37))

## 4.0.0-beta.1 - 2022.03.09

### Added
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
The MIT License (MIT)
Copyright (c) 2017 nystudio107
Copyright (c) 2022 nystudio107

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nystudio107/craft-cookies/badges/quality-score.png?b=v1)](https://scrutinizer-ci.com/g/nystudio107/craft-cookies/?branch=v1) [![Code Coverage](https://scrutinizer-ci.com/g/nystudio107/craft-cookies/badges/coverage.png?b=v1)](https://scrutinizer-ci.com/g/nystudio107/craft-cookies/?branch=v1) [![Build Status](https://scrutinizer-ci.com/g/nystudio107/craft-cookies/badges/build.png?b=v1)](https://scrutinizer-ci.com/g/nystudio107/craft-cookies/build-status/v1) [![Code Intelligence Status](https://scrutinizer-ci.com/g/nystudio107/craft-cookies/badges/code-intelligence.svg?b=v1)](https://scrutinizer-ci.com/code-intelligence)

# Cookies plugin for Craft CMS 3.x
# Cookies plugin for Craft CMS 4.x

A simple plugin for setting and getting cookies from within [Craft CMS](http://craftcms.com) templates.

Expand All @@ -10,7 +10,7 @@ Related: [Cookies for Craft 2.x](https://github.com/nystudio107/cookies)

## Requirements

This plugin requires Craft CMS 3.0.0 or later.
This plugin requires Craft CMS 4.0.0 or later.

**Installation**

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nystudio107/craft-cookies",
"description": "A simple plugin for setting and getting cookies from within Craft CMS templates.",
"type": "craft-plugin",
"version": "4.0.0-beta.1",
"version": "4.0.0",
"keywords": [
"craft",
"cms",
Expand All @@ -23,7 +23,7 @@
}
],
"require": {
"craftcms/cms": "^4.0.0-alpha.1"
"craftcms/cms": "^4.0.0"
},
"autoload": {
"psr-4": {
Expand Down
10 changes: 5 additions & 5 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ DOCKERRUN=docker container run \
${CONTAINER}:${TAG}
DOCSDEST?=../../../sites/nystudio107/web/docs/cookies

.PHONY: docker build dev fix install lint update npm
.PHONY: docker build dev fix install lint clean npm

docker:
docker build \
. \
-t ${CONTAINER}:${TAG} \
--build-arg TAG=${TAG} \
--no-cache
build: docker install update
build: clean docker install
${DOCKERRUN} \
run docs:build
rm -rf ${DOCSDEST}
Expand All @@ -34,9 +34,9 @@ install: docker
lint: docker install
${DOCKERRUN} \
run docs:lint
update: docker
${DOCKERRUN} \
update
clean:
rm -rf node_modules/
rm -f package-lock.json
npm: docker
${DOCKERRUN} \
$(filter-out $@,$(MAKECMDGOALS))
Expand Down
Loading

0 comments on commit 00146c6

Please sign in to comment.