Merge pull request #548 from watson-developer-cloud/v3.0.0

v3.0.0

Author: mediumTaj

.bumpversion.cfg

@@ -1,13 +1,10 @@
 [bumpversion]
-current_version = 2.15.3
+current_version = 2.15.4
 commit = True
 message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
 
 [bumpversion:file:Doxyfile]
-search = {current_version}
-replace = {new_version}
 
-[bumpversion:file:Scripts/Utilities/Constants.cs]
+[bumpversion:file:Common/Common.cs]
 search = {current_version}
 replace = {new_version}
-

.github/ISSUE_TEMPLATE/bug_report.md

@@ -78,5 +78,5 @@ Docs/publishing-release.md.meta
 /Scripts/Editor/Help/
 /Scripts/Editor/Help.meta
 */MRefBuilder.config.meta
-package-lock.json
-package-lock.json.meta
+node_modules
+package-lock.json

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,3 @@
+[submodule "Core"]
+	path = Core
+	url = [email protected]:IBM/unity-sdk-core.git

.gitignore

@@ -2,10 +2,9 @@
   "branch": "master",
   "verifyConditions": [],
   "prepare": [
-    "@semantic-release/git",
-    {
+        {
       "path": "@semantic-release/exec",
-      "cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} --allow-dirty --verbose patch"
+      "cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} patch"
     }
   ],
   "publish": ["@semantic-release/github"]

.gitmodules

@@ -9,15 +9,18 @@ rvm:
 cache:
   directories:
     - ./Unity
+git:
+  submodules: false
 before_install:
+# Use sed to replace the SSH URL with the public URL, then initialize submodules
+- sed -i -e 's/[email protected]:/https:\/\/github.com\//' .gitmodules
+- git submodule update --init --recursive
 - chmod a+x ./Travis/installUnity.sh
 - npm install -g [email protected]
 install:
 - pip install bumpversion
 - ./Travis/installUnity.sh
 - npm install @semantic-release/exec
-- npm install @semantic-release/git
-- npm install @semantic-release/changelog
 before_script:
 - chmod a+x ./Travis/createProject.sh
 - chmod a+x ./Travis/installSDK.sh
@@ -28,7 +31,6 @@ script:
 - ./Travis/installSDK.sh
 # - ./Travis/runTests.sh
 # - ./Travis/build.sh
-- git reset --hard
 deploy:
   - provider: script
     skip_cleanup: true

.releaserc

@@ -0,0 +1,60 @@
+/**
+* Copyright 2019 IBM Corp. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+using IBM.Cloud.SDK.Utilities;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace IBM.Watson
+{
+    public class Common : MonoBehaviour
+    {
+        /// <summary>
+        /// The SDK version.
+        /// </summary>
+        public const string Version = "watson-apis-unity-sdk-2.15.4";
+        /// <summary>
+        /// Tracking for onboarding.
+        /// </summary>
+        public const string TrackingQueryParam = "target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Unity";
+        /// <summary>
+        /// Returns a set of default headers to use with each request.
+        /// </summary>
+        /// <param name="serviceName">The service name to be used in X-IBMCloud-SDK-Analytics header.</param>
+        /// <param name="serviceVersion">The service version to be used in X-IBMCloud-SDK-Analytics header.</param>
+        /// <param name="operation">The operation name to be used in X-IBMCloud-SDK-Analytics header.</param>
+        /// <returns></returns>
+        public static Dictionary<string, string> GetSdkHeaders(string serviceName, string serviceVersion, string operationId)
+        {
+            Dictionary<string, string> defaultHeaders = new Dictionary<string, string>();
+            defaultHeaders.Add("X-IBMCloud-SDK-Analytics", 
+                string.Format("service_name={0};service_version={1};operation_id={2}", 
+                serviceName, 
+                serviceVersion, 
+                operationId));
+            defaultHeaders.Add("User-Agent",
+                string.Format(
+                    "{0} {1} {2} {3}",
+                    Version,
+                    SystemInformation.Os,
+                    SystemInformation.OsVersion,
+                    Application.unityVersion
+                ));
+            return defaultHeaders;
+        }
+    }
+}

.travis.yml

@@ -38,7 +38,7 @@ PROJECT_NAME           = "IBM Watson SDK for Unity"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.15.3
+PROJECT_NUMBER         = 2.15.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Common.meta

@@ -0,0 +1,30 @@
+/**
+* Copyright 2018 IBM Corp. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+using IBM.Cloud.SDK;
+using UnityEngine;
+
+namespace IBM.Watson.Editor
+{
+    public class IBMCloudSignup : MonoBehaviour
+    {
+        public static void OpenIBMCloudWebsite()
+        {
+            Application.OpenURL(Constants.String.IBM_CLOUD_URL + "?" + Common.TrackingQueryParam);
+        }
+    }
+}

Common/Common.cs

@@ -20,7 +20,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace IBM.Watson.DeveloperCloud.Editor
+namespace IBM.Watson.Editor
 {
     public class WatsonMenu : MonoBehaviour
     {