Skip to content

Commit 9f51ef4

Browse files
authored
Merge pull request #1025 from watson-developer-cloud/feat/q3-release-1
Feat/q3 release 1
2 parents 763e73b + 10495cd commit 9f51ef4

File tree

258 files changed

+8016
-3448
lines changed

Some content is hidden

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

258 files changed

+8016
-3448
lines changed

.swiftformat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--rules indent
2+
--ifdef noindent
3+
--indent 4
4+
--swiftversion 5.2

.travis.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
osx_image: xcode10.1
2-
addons:
2+
addons:
33
homebrew:
44
packages:
55
- carthage
@@ -18,8 +18,8 @@ jobs:
1818
osx_image: xcode11
1919
before_install:
2020
- brew install carthage || true
21-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
22-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
21+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
22+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
2323
-d
2424
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
2525
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -38,8 +38,8 @@ jobs:
3838
osx_image: xcode11
3939
before_install:
4040
- brew install carthage || true
41-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
42-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
41+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
42+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
4343
-d
4444
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
4545
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -58,8 +58,8 @@ jobs:
5858
osx_image: xcode11
5959
before_install:
6060
- brew install carthage || true
61-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
62-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
61+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
62+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
6363
-d
6464
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
6565
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -78,8 +78,8 @@ jobs:
7878
osx_image: xcode11
7979
before_install:
8080
- brew install carthage || true
81-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
82-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
81+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
82+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
8383
-d
8484
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
8585
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -98,8 +98,8 @@ jobs:
9898
osx_image: xcode11
9999
before_install:
100100
- brew install carthage || true
101-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
102-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
101+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
102+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
103103
-d
104104
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
105105
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -118,8 +118,8 @@ jobs:
118118
osx_image: xcode11
119119
before_install:
120120
- brew install carthage || true
121-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
122-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
121+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
122+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
123123
-d
124124
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
125125
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -138,8 +138,8 @@ jobs:
138138
osx_image: xcode11
139139
before_install:
140140
- brew install carthage || true
141-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
142-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
141+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
142+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
143143
-d
144144
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
145145
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -158,8 +158,8 @@ jobs:
158158
osx_image: xcode11
159159
before_install:
160160
- brew install carthage || true
161-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
162-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
161+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
162+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
163163
-d
164164
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
165165
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -178,8 +178,8 @@ jobs:
178178
osx_image: xcode11
179179
before_install:
180180
- brew install carthage || true
181-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
182-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
181+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
182+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
183183
-d
184184
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
185185
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -198,8 +198,8 @@ jobs:
198198
osx_image: xcode11
199199
before_install:
200200
- brew install carthage || true
201-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
202-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
201+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
202+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
203203
-d
204204
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
205205
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -218,8 +218,8 @@ jobs:
218218
osx_image: xcode11
219219
before_install:
220220
- brew install carthage || true
221-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
222-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
221+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
222+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
223223
-d
224224
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
225225
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -238,8 +238,8 @@ jobs:
238238
osx_image: xcode11
239239
before_install:
240240
- brew install carthage || true
241-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
242-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
241+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
242+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
243243
-d
244244
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
245245
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -258,8 +258,8 @@ jobs:
258258
osx_image: xcode11
259259
before_install:
260260
- brew install carthage || true
261-
- openssl aes-256-cbc -K $encrypted_6b91f4629b52_key -iv $encrypted_6b91f4629b52_iv
262-
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
261+
- openssl aes-256-cbc -K $encrypted_fbac8f4690fc_key -iv $encrypted_fbac8f4690fc_iv
262+
-in ./Source/SupportingFiles/WatsonCredentials.swift.enc -out ./Source/SupportingFiles/WatsonCredentials.swift
263263
-d
264264
- openssl aes-256-cbc -K $encrypted_d84ac0b7eb5c_key -iv $encrypted_d84ac0b7eb5c_iv
265265
-in Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials-input.json.enc
@@ -283,8 +283,8 @@ jobs:
283283
os: osx
284284
osx_image: xcode11
285285
if: branch = master AND type = push AND fork = false
286-
- stage: publish documentation
287-
script: "./Scripts/travis/publish-documentation.sh"
288-
os: osx
289-
osx_image: xcode11
286+
- stage: publish documentation
287+
script: "./Scripts/travis/publish-documentation.sh"
288+
os: osx
289+
osx_image: xcode11
290290
if: branch = master AND type = push AND fork = false

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "IBM/swift-sdk-core" "1.0.0"
1+
github "IBM/swift-sdk-core" "1.1.0"
22
github "daltoniam/Starscream" "3.0.5"

0 commit comments

Comments
 (0)