Skip to content

Commit e3f62ba

Browse files
authored
Merge branch 'master' into master
2 parents 40b174f + 1d626fb commit e3f62ba

File tree

116 files changed

+4880
-2182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+4880
-2182
lines changed

.bumpversion.cfg

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[bumpversion]
2+
current_version = 2.13.1
3+
commit = True
4+
message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
5+
6+
[bumpversion:file:Doxyfile]
7+
search = {current_version}
8+
replace = {new_version}
9+
10+
[bumpversion:file:Scripts/Utilities/Constants.cs]
11+
search = {current_version}
12+
replace = {new_version}
13+

.pre-commit-config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- repo: [email protected]:Whitewater/whitewater-detect-secrets
2+
rev: master
3+
hooks:
4+
- id: detect-secrets # pragma: whitelist secret
5+
args: [--baseline, .secrets.baseline, --no-keyword-scan ]

.releaserc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"branch": "master",
33
"verifyConditions": [],
4-
"prepare": [],
4+
"prepare": [
5+
"@semantic-release/git",
6+
{
7+
"path": "@semantic-release/exec",
8+
"cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} --allow-dirty --verbose patch"
9+
}
10+
],
511
"publish": ["@semantic-release/github"]
612
}

.secrets.baseline

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"exclude_regex": null,
3+
"generated_at": "2019-01-08T20:20:54Z",
4+
"plugins_used": [
5+
{
6+
"base64_limit": 4.5,
7+
"name": "Base64HighEntropyString"
8+
},
9+
{
10+
"name": "BasicAuthDetector"
11+
},
12+
{
13+
"hex_limit": 3,
14+
"name": "HexHighEntropyString"
15+
},
16+
{
17+
"name": "PrivateKeyDetector"
18+
},
19+
{
20+
"name": "SlackDetector"
21+
}
22+
],
23+
"results": {},
24+
"version": "0.10.3"
25+
}

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ before_install:
1313
- chmod a+x ./Travis/installUnity.sh
1414
- npm install -g [email protected]
1515
install:
16+
- pip install bumpversion
1617
- ./Travis/installUnity.sh
1718
- npm install @semantic-release/exec
19+
- npm install @semantic-release/git
20+
- npm install @semantic-release/changelog
1821
before_script:
1922
- chmod a+x ./Travis/createProject.sh
2023
- chmod a+x ./Travis/installSDK.sh
@@ -25,6 +28,7 @@ script:
2528
- ./Travis/installSDK.sh
2629
# - ./Travis/runTests.sh
2730
# - ./Travis/build.sh
31+
- git reset --hard
2832
deploy:
2933
- provider: script
3034
skip_cleanup: true

Examples/ServiceExamples/ExampleGetToken.unity.meta renamed to Assistant.meta

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assistant/v2.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Core.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Core/Editor.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Core/Editor/Help.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Core/Editor/Help/Working.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "IBM Watson SDK for Unity"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.12.0
41+
PROJECT_NUMBER = 2.13.1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

0 commit comments

Comments
 (0)