Commit 22bfa514 authored by UnityMethodPatcher CI's avatar UnityMethodPatcher CI
Browse files

[CI] Changes for 1-10-5

Showing with 40 additions and 38 deletions
+40 -38
......@@ -130,7 +130,11 @@ namespace SingularityGroup.HotReload.Editor.Cli {
await ThreadUtility.SwitchToMainThread();
var buildInfo = BuildInfoHelper.GenerateBuildInfoMainThread();
await Task.Run(() => {
PrepareBuildInfo(buildInfo);
try {
PrepareBuildInfo(buildInfo);
} catch {
// ignore, we will warn when making a build
}
});
}
......
......@@ -5,7 +5,7 @@ namespace SingularityGroup.HotReload.Editor {
public const string ProductPurchaseURL = WebsiteURL + "/pricing";
public const string DocumentationURL = WebsiteURL + "/documentation";
public const string AdditionalContentURL = WebsiteURL + "/documentation#getting-started";
public const string AdditionalContentURL = DocumentationURL + "/getting-started#downloading-additional-content";
public const string DownloadUrl = WebsiteURL + "/download";
public const string ContactURL = WebsiteURL + "/contact";
public const string ForumURL = "https://forum.unity.com/threads/hot-reload-edit-code-without-compiling.1389969/";
......
......@@ -39,8 +39,11 @@ namespace SingularityGroup.HotReload.Editor {
EditorGUILayout.HelpBox($"You are running Hot Reload for Unity version {PackageConst.Version}. ", MessageType.Info);
EditorGUILayout.Space();
_buyLicenseButton.OnGUI();
EditorGUILayout.Space();
var licenseRequired = !PackageConst.LoginNotRequired;
if (licenseRequired) {
_buyLicenseButton.OnGUI();
EditorGUILayout.Space();
}
foreach (var group in _supportButtons) {
using (new EditorGUILayout.HorizontalScope()) {
......
......@@ -72,8 +72,6 @@ namespace SingularityGroup.HotReload.Editor {
private DateTime? _serverStartedAt;
bool createdAccount;
public bool FreeLicense => _status?.isFree == true;
public bool TrialExpired => _status?.lastLicenseError == "TrialLicenseExpiredException";
// Has Indie or Pro license (even if not currenctly active)
......@@ -171,7 +169,7 @@ namespace SingularityGroup.HotReload.Editor {
}
public void RenderConsumption() {
if (_status == null) {
if (_status == null || _status.isFree) {
return;
}
EditorGUILayout.LabelField($"Using Free license", HotReloadWindowStyles.MediumMiddleCenterStyle);
......@@ -469,15 +467,6 @@ namespace SingularityGroup.HotReload.Editor {
GUIContent content = null;
if (_status == null) {
// no info
} else if (_status.isFree) {
if (verbose) {
message = " Free license active";
messageType = MessageType.Info;
if (businessLicenseContent == null) {
businessLicenseContent = new GUIContent(message, EditorGUIUtility.FindTexture("TestPassed"));
}
content = businessLicenseContent;
}
} else if (_status.lastLicenseError != null) {
messageType = !_status.freeSessionFinished ? MessageType.Warning : MessageType.Error;
message = GetMessageFromError(_status.lastLicenseError);
......
......@@ -167,17 +167,14 @@ namespace SingularityGroup.HotReload.Editor {
if (PackageConst.LoginNotRequired) {
return false;
}
if (!_window.runTab.FreeLicense) {
_window.runTab.RenderLicenseInfo(
verbose: true,
allowHide: false,
overrideRenderFreeTrial: false,
overrideActionButton: "Activate License",
showConsumptions: true
);
return true;
}
return false;
_window.runTab.RenderLicenseInfo(
verbose: true,
allowHide: false,
overrideRenderFreeTrial: false,
overrideActionButton: "Activate License",
showConsumptions: true
);
return true;
}
private bool RenderPromoCodeSection() {
......
......@@ -230,9 +230,7 @@ namespace SingularityGroup.HotReload.Editor {
padding = new RectOffset(10, 10, 10, 10)
});
void RenderRateApp() {
if (HotReloadPrefs.RateAppShown
|| !PackageConst.IsAssetStoreBuild
) {
if (HotReloadPrefs.RateAppShown) {
return;
}
var activeDays = EditorCodePatcher.GetActiveDaysForRateApp();
......
......@@ -9,10 +9,10 @@ namespace SingularityGroup.HotReload {
public static bool LoginNotRequired => IsAssetStoreBuild && !Application.HasProLicense();
public const string Version = "1.10.4";
public const string Version = "1.10.5";
// Never higher than Version
// Used for the download
public const string ServerVersion = "1.10.4";
public const string ServerVersion = "1.10.5";
public const string PackageName = "com.singularitygroup.hotreload";
public const string LibraryCachePath = "Library/" + PackageName;
public const string ConfigFileName = "hot-reload-config.json";
......
{
"displayName": "Hot Reload",
"name": "com.singularitygroup.hotreload",
"unity": "2018.4",
"description": "Change code and get immediate updates in the Unity Editor or on-device.",
"displayName": "Hot Reload",
"name": "com.singularitygroup.hotreload",
"unity": "2018.4",
"description": "Change code and get immediate updates in the Unity Editor or on-device.",
"category": "Engineering",
"keywords": ["Hot", "Reload", "patch", "code", "sg", "singularity"],
"version": "1.10.4"
"keywords": [
"Hot",
"Reload",
"patch",
"code",
"sg",
"singularity"
],
"version": "1.10.5",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0"
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment