Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed Dec 11, 2023
2 parents a3467e4 + c7f16ba commit b01a08e
Show file tree
Hide file tree
Showing 6 changed files with 178 additions and 167 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Hola amigo! I'm really excited that you are interested in contributing to ColdBo
- [Security Vulnerabilities](#security-vulnerabilities)
- [Development Setup](#development-setup)
- [Language Compatiblity](#language-compatiblity)
- [Coding Styles \& Formatting](#coding-styles--formatting)
- [Coding Styles + Formatting](#coding-styles--formatting)
- [CFC Docs With DocBox](#cfc-docs-with-docbox)
- [Financial Contributions](#financial-contributions)
- [Contributors](#contributors)
Expand Down Expand Up @@ -68,7 +68,7 @@ Please make sure your code runs on the following CFML Engines:
- Lucee 5+
- Adobe ColdFusion 2018+

## Coding Styles & Formatting
## Coding Styles + Formatting

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:

Expand Down
22 changes: 11 additions & 11 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"ColdBox Platform",
"version":"7.2.0",
"version":"7.2.1",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox/@build.version@/[email protected]@.zip",
"author":"Ortus Solutions <[email protected]>",
"slug":"coldbox",
Expand Down Expand Up @@ -49,16 +49,16 @@
},
"scripts":{
"release":"recipe build/release.boxr",
"tests": "task run build/Build.cfc runTests",
"tests:integration": "task run build/Build.cfc runTests integration",
"tests:mvc": "task run build/Build.cfc runTests mvc",
"tests:cachebox": "task run build/Build.cfc runTests cachebox",
"tests:logbox": "task run build/Build.cfc runTests logbox",
"tests:wirebox": "task run build/Build.cfc runTests wirebox",
"tests:core": "task run build/Build.cfc runTests core",
"tests:async": "task run build/Build.cfc runTests async",
"apidocs" : "task run build/Build.cfc buildDocs",
"build": "task run build/Build.cfc run :docs=false",
"tests":"task run build/Build.cfc runTests",
"tests:integration":"task run build/Build.cfc runTests integration",
"tests:mvc":"task run build/Build.cfc runTests mvc",
"tests:cachebox":"task run build/Build.cfc runTests cachebox",
"tests:logbox":"task run build/Build.cfc runTests logbox",
"tests:wirebox":"task run build/Build.cfc runTests wirebox",
"tests:core":"task run build/Build.cfc runTests core",
"tests:async":"task run build/Build.cfc runTests async",
"apidocs":"task run build/Build.cfc buildDocs",
"build":"task run build/Build.cfc run :docs=false",
"format":"cfformat run system/**/*.cfc,tests/specs/**/*.cfc --overwrite",
"format:watch":"cfformat watch system/**/*.cfc,tests/specs/**/*.cfc ./.cfformat.json",
"format:check":"cfformat check system/**/*.cfc,tests/specs/**/*.cfc ./.cfformat.json",
Expand Down
2 changes: 1 addition & 1 deletion build/Build.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ component {
variables.apiDocs = "http://localhost:#variables.serverPort#/apidocs";

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

variables.libraries = {
"coldbox" : {
Expand Down
Loading

0 comments on commit b01a08e

Please sign in to comment.