Skip to content

Commit b01a08e

Browse files
committed
Merge branch 'development'
2 parents a3467e4 + c7f16ba commit b01a08e

File tree

6 files changed

+178
-167
lines changed

6 files changed

+178
-167
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Hola amigo! I'm really excited that you are interested in contributing to ColdBo
99
- [Security Vulnerabilities](#security-vulnerabilities)
1010
- [Development Setup](#development-setup)
1111
- [Language Compatiblity](#language-compatiblity)
12-
- [Coding Styles \& Formatting](#coding-styles--formatting)
12+
- [Coding Styles + Formatting](#coding-styles--formatting)
1313
- [CFC Docs With DocBox](#cfc-docs-with-docbox)
1414
- [Financial Contributions](#financial-contributions)
1515
- [Contributors](#contributors)
@@ -68,7 +68,7 @@ Please make sure your code runs on the following CFML Engines:
6868
- Lucee 5+
6969
- Adobe ColdFusion 2018+
7070

71-
## Coding Styles & Formatting
71+
## Coding Styles + Formatting
7272

7373
We are big on coding styles and have included a `.cfformat.json` in the root of the project so that you can run the formatting tools and CommandBox scripts:
7474

box.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"ColdBox Platform",
3-
"version":"7.2.0",
3+
"version":"7.2.1",
44
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox/@build.version@/[email protected]@.zip",
55
"author":"Ortus Solutions <[email protected]>",
66
"slug":"coldbox",
@@ -49,16 +49,16 @@
4949
},
5050
"scripts":{
5151
"release":"recipe build/release.boxr",
52-
"tests": "task run build/Build.cfc runTests",
53-
"tests:integration": "task run build/Build.cfc runTests integration",
54-
"tests:mvc": "task run build/Build.cfc runTests mvc",
55-
"tests:cachebox": "task run build/Build.cfc runTests cachebox",
56-
"tests:logbox": "task run build/Build.cfc runTests logbox",
57-
"tests:wirebox": "task run build/Build.cfc runTests wirebox",
58-
"tests:core": "task run build/Build.cfc runTests core",
59-
"tests:async": "task run build/Build.cfc runTests async",
60-
"apidocs" : "task run build/Build.cfc buildDocs",
61-
"build": "task run build/Build.cfc run :docs=false",
52+
"tests":"task run build/Build.cfc runTests",
53+
"tests:integration":"task run build/Build.cfc runTests integration",
54+
"tests:mvc":"task run build/Build.cfc runTests mvc",
55+
"tests:cachebox":"task run build/Build.cfc runTests cachebox",
56+
"tests:logbox":"task run build/Build.cfc runTests logbox",
57+
"tests:wirebox":"task run build/Build.cfc runTests wirebox",
58+
"tests:core":"task run build/Build.cfc runTests core",
59+
"tests:async":"task run build/Build.cfc runTests async",
60+
"apidocs":"task run build/Build.cfc buildDocs",
61+
"build":"task run build/Build.cfc run :docs=false",
6262
"format":"cfformat run system/**/*.cfc,tests/specs/**/*.cfc --overwrite",
6363
"format:watch":"cfformat watch system/**/*.cfc,tests/specs/**/*.cfc ./.cfformat.json",
6464
"format:check":"cfformat check system/**/*.cfc,tests/specs/**/*.cfc ./.cfformat.json",

build/Build.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ component {
1616
variables.apiDocs = "http://localhost:#variables.serverPort#/apidocs";
1717

1818
// Source Excludes Not Added to final binary
19-
variables.excludes = [ "^\..*", "build", "test-harness" ];
19+
variables.excludes = [ "^\..*", "\/build\/", "test-harness" ];
2020

2121
variables.libraries = {
2222
"coldbox" : {

0 commit comments

Comments
 (0)