Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0b5e246
Update Enums, Updated C# Binary
ah1053 Dec 9, 2021
2476a6e
EDGECLOUD-4791 Fix for IP To GeoLocation occasionally returns 0,0
ah1053 Jan 18, 2022
5d44550
Specify the returned location
ah1053 Jan 18, 2022
53bb911
EDGECLOUD-4351 Create a SDK Template Script for Unity
ah1053 Jan 19, 2022
8e8b862
Add line at EOF
ah1053 Jan 19, 2022
1d0426f
Merge pull request #201 from mobiledgex/EDGECLOUD-4351
Jan 27, 2022
74db5d4
Merge pull request #200 from mobiledgex/EDGECLOUD-4791
Jan 27, 2022
4ae4c4e
Use Abort only in Disposing websocket object
ah1053 Jan 27, 2022
d6d11d1
Merge pull request #203 from mobiledgex/ws-dispose
ah1053 Feb 10, 2022
a3c2ce4
QoS Example and Meta file
ah1053 Feb 10, 2022
e86c5ad
Merge pull request #199 from mobiledgex/proto-updates
ah1053 Feb 10, 2022
b4fae93
Merge pull request #204 from mobiledgex/qos-example
ah1053 Feb 11, 2022
33c0c0d
Remove MEL References
ah1053 Mar 11, 2022
1e14920
Update VerifyLocation Enums
ah1053 Mar 13, 2022
c3797ba
Fix broken Debug Binary
ah1053 Mar 13, 2022
f458805
Update Unit Tests
ah1053 Mar 13, 2022
659893c
Update LProto enums for Tests
ah1053 Mar 14, 2022
35286cf
Fix compilation errors, switch to eu-staging for testinh
ah1053 Mar 14, 2022
d802765
Merge pull request #210 from mobiledgex/EDGECLOUD-6227-rest
ah1053 Mar 14, 2022
ec580cd
Pipeline initial
ah1053 Mar 21, 2022
e44f610
Run action on push for testing only
ah1053 Mar 21, 2022
e1adbb4
Clean working directory before commit
ah1053 Mar 21, 2022
2c5c385
Update tracked files
ah1053 Mar 22, 2022
f859d73
Skip internal checkout step
ah1053 Mar 22, 2022
70d7719
Remove add options
ah1053 Mar 22, 2022
071ea70
Update Docs Navbar
ah1053 Mar 22, 2022
2e61834
Update docs on release only
ah1053 Mar 22, 2022
b868120
Use docs branch as the base
ah1053 Mar 23, 2022
f145d50
Merge pull request #212 from mobiledgex/docs-pipeline
ah1053 Mar 23, 2022
008dfd4
CarrierInfoIntegration comments
ah1053 Apr 8, 2022
4c17e6b
DeviceInfoIntegration docs
ah1053 Apr 11, 2022
4655756
Logger.cs, MobiledgeXIntegration classes
ah1053 Apr 11, 2022
9f38de5
MobiledgeXSettings
ah1053 Apr 12, 2022
494a0e3
Merge pull request #214 from mobiledgex/doc-comments
ah1053 Apr 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/workflows/docs_update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@


name: MobiledgeX Unity Docs Update

on: [release]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Check out Docs branch
uses: actions/checkout@v2
with:
ref: docs

- name: Check out the SDK master branch (REST)
uses: actions/checkout@v2
with:
ref: master
path: ./sdk

- name: Update Docs
uses: mattnotmitt/doxygen-action@v1.9.2
with:
doxyfile-path: './config/Doxyfile'

- name: Clean before commit
run: |
sudo rm -rf ./sdk
sudo mv docs/html/* docs/
sudo rm -rf docs/html
sudo cp ./config/tab_b.png ./docs/tab_b.png
shell: bash

- name: Commit Doxygen Updates
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Docs Automated Updates
branch: docs
push_options: '--force'
skip_checkout: true
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: |
rm -rf ./project/EmptyProject/Assets/Tests/Editor
rm ./project/EmptyProject/Assets/Tests/Editor.meta

- name: Run Tests using Unity TestRunner
uses: game-ci/unity-test-runner@v2
id: tests
Expand Down
12 changes: 7 additions & 5 deletions Editor/MobiledgeXEditorWindow.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2018-2021 MobiledgeX, Inc. All rights and licenses reserved.
* Copyright 2018-2022 MobiledgeX, Inc. All rights and licenses reserved.
* MobiledgeX, Inc. 156 2nd Street #408, San Francisco, CA 94105
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -224,8 +224,12 @@ void OnInspectorUpdate()
string GetSDKVersion()
{
TextAsset asset = (TextAsset)AssetDatabase.LoadAssetAtPath("Packages/com.mobiledgex.sdk/package.json", typeof(TextAsset));
string sdkVersion = JsonUtility.FromJson<PackageDetails>(asset.text).version;
return "v" + sdkVersion;
if (asset != null)
{
string sdkVersion = JsonUtility.FromJson<PackageDetails>(asset.text).version;
return "v" + sdkVersion;
}
return "DEBUG_VER";
}

/// <summary>
Expand Down Expand Up @@ -441,7 +445,6 @@ void AddMobiledgeXPlugins()
string iosPluginPath = Path.GetFullPath("Packages/com.mobiledgex.sdk/Runtime/Plugins/iOS/PlatformIntegration.m");
string linkXMLPath = Path.GetFullPath("Packages/com.mobiledgex.sdk/link.xml");
string settingPath = Path.GetFullPath("Packages/com.mobiledgex.sdk/Resources/MobiledgeXSettings.asset");
string melAARPath = Path.GetFullPath("Packages/com.mobiledgex.sdk/Runtime/Plugins/Android/mel.aar");
try
{
if (!Directory.Exists(@unityPluginsFolderPath))
Expand All @@ -468,7 +471,6 @@ void AddMobiledgeXPlugins()
{
AssetDatabase.CreateFolder("Assets/Plugins/MobiledgeX", "Android");
}
MoveFile(melAARPath, Path.Combine(@mobiledgeXFolderPath, @"Android/mel.aar"), true);
AssetDatabase.Refresh();
}
catch (Exception e)
Expand Down
58 changes: 58 additions & 0 deletions Editor/TemplateGenerator.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/**
* Copyright 2018-2022 MobiledgeX, Inc. All rights and licenses reserved.
* MobiledgeX, Inc. 156 2nd Street #408, San Francisco, CA 94105
*
* 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.
*/

#if UNITY_EDITOR
using UnityEngine;
using UnityEditor;
using System.IO;

namespace MobiledgeX
{
public class TemplateGenerator : MonoBehaviour
{
[MenuItem("MobiledgeX/Create/GetUrlScript", false, 1)]
static void CreateGetUrlScript()
{
string pathUnityPackage = Application.dataPath+"/Runtime/Scripts/ExampleRest.cs";//used if sdk is imported using unity package
string pathGitUrl = "Packages/com.mobiledgex.sdk/Runtime/Scripts/ExampleRest.cs";//used if sdk is imported using git url
if (!File.Exists(pathGitUrl))
{
Debug.LogError("Source file not found, Please file an issue to https://github.com/mobiledgex/edge-cloud-sdk-unity/issues/new?body=Reported%20on%20Unity" + Application.unityVersion);
return;
}
string[] lines = File.ReadAllLines(pathGitUrl);
lines[29] = "public class GetUrl : MonoBehaviour";
string fileLocation = Application.dataPath + "/GetUrl.cs";
if (File.Exists(fileLocation))
{
Debug.LogError($"{fileLocation} already exists");
return;
}
using (StreamWriter outfile = new StreamWriter(fileLocation))
{
int counter = 0;
while (counter < lines.Length)
{
outfile.WriteLine(lines[counter]);
counter++;
}
}
AssetDatabase.Refresh();
}
}
}
#endif

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions Runtime/Plugins/Android.meta

This file was deleted.

Binary file removed Runtime/Plugins/Android/mel.aar
Binary file not shown.
32 changes: 0 additions & 32 deletions Runtime/Plugins/Android/mel.aar.meta

This file was deleted.

Binary file modified Runtime/Plugins/MatchingEngineSDKRestLibrary.dll
Binary file not shown.
Loading