Merge branch 'develop' into trunk

10up · Jun 23, 2022 · 98b21a7 · 98b21a7
2 parents 6cae8fd + 7a264e1
commit 98b21a7
Show file tree

Hide file tree

Showing 7 changed files with 3,750 additions and 3,917 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -11,6 +11,7 @@
 /CHANGELOG.md export-ignore
 /CODE_OF_CONDUCT.md export-ignore
 /composer.json export-ignore
+/composer.lock export-ignore
 /CONTRIBUTING.md export-ignore
 /CREDITS.md export-ignore
 /Gruntfile.js export-ignore

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 node_modules
-composer.lock
 phpunit.xml
 .idea
 .sass-cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased]
 
-## [1.2.0] - 2021-06-21
+## [1.2.0] - 2022-06-23
 ### Added
 - Dependency security scanning (props [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#81](https://github.com/10up/eight-day-week/pull/81)).
 

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-	"name": "eight-day-week",
+	"name": "10up/eight-day-week",
 	"description": "Tools that help improve the digital/print production workflows.",
 	"type": "wordpress-plugin",
 	"keywords": [],
@@ -13,14 +13,14 @@
 			"role": "Developer"
 		}
 	],
-    	"minimum-stability": "dev",
+	"minimum-stability": "dev",
 	"require": {
 		"php": ">=5.4"
 	},
-    	"require-dev": {
+	"require-dev": {
 		"antecedent/patchwork": "2.1.*",
 		"phpunit/phpunit": "*@stable",
-	    	"brianium/paratest": "dev-master",
-        	"10up/wp_mock": "dev-master"
-    }
+		"brianium/paratest": "6.x-dev",
+		"10up/wp_mock": "dev-master"
+	}
 }