From 24f4b29ab7646c69de8120409d87f056162a3836 Mon Sep 17 00:00:00 2001 From: riina <54872398+riina@users.noreply.github.com> Date: Thu, 8 Apr 2021 23:47:04 -0700 Subject: [PATCH 1/3] Add conditional localization import Localization API moved in 2020.1 and 2020.2 --- Editor/AssmblyInfo.cs | 6 +++++- Editor/AutoSpringBoneSetup.cs | 6 +++++- Editor/GUI/Windows/LoadSpringBoneSetupWindow.cs | 6 +++++- Editor/GUI/Windows/MirrorSpringBoneWindow.cs | 6 +++++- Editor/GUI/Windows/SaveSpringBoneSetupWindow.cs | 6 +++++- Editor/GUI/Windows/SpringBoneSetupErrorWindow.cs | 6 +++++- Editor/GUI/Windows/SpringBoneWindow.cs | 6 +++++- Editor/SpringBoneEditorActions.cs | 6 +++++- Editor/SpringColliderEditorActions.cs | 6 +++++- Editor/Utility/FindGameObjectsWindow.cs | 6 +++++- Editor/Utility/SetObjectParentWindow.cs | 6 +++++- 11 files changed, 55 insertions(+), 11 deletions(-) diff --git a/Editor/AssmblyInfo.cs b/Editor/AssmblyInfo.cs index 6915ff6..955ca8c 100644 --- a/Editor/AssmblyInfo.cs +++ b/Editor/AssmblyInfo.cs @@ -1,3 +1,7 @@ -using UnityEditor.Localization.Editor; +#if UNITY_2020_1_OR_NEWER +using Localization = UnityEditor.LocalizationAttribute; +#else +using Localization = UnityEditor.Localization.Editor.LocalizationAttribute; +#endif [assembly: Localization] \ No newline at end of file diff --git a/Editor/AutoSpringBoneSetup.cs b/Editor/AutoSpringBoneSetup.cs index 07d1a13..2f0ca90 100755 --- a/Editor/AutoSpringBoneSetup.cs +++ b/Editor/AutoSpringBoneSetup.cs @@ -3,7 +3,11 @@ using System.Linq; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/GUI/Windows/LoadSpringBoneSetupWindow.cs b/Editor/GUI/Windows/LoadSpringBoneSetupWindow.cs index 8497952..d2a754e 100755 --- a/Editor/GUI/Windows/LoadSpringBoneSetupWindow.cs +++ b/Editor/GUI/Windows/LoadSpringBoneSetupWindow.cs @@ -1,7 +1,11 @@ using System.Linq; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/GUI/Windows/MirrorSpringBoneWindow.cs b/Editor/GUI/Windows/MirrorSpringBoneWindow.cs index 589f592..6781f9e 100755 --- a/Editor/GUI/Windows/MirrorSpringBoneWindow.cs +++ b/Editor/GUI/Windows/MirrorSpringBoneWindow.cs @@ -3,7 +3,11 @@ using UnityEditor; using UnityEngine; using Unity.Animations.SpringBones.GameObjectExtensions; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/GUI/Windows/SaveSpringBoneSetupWindow.cs b/Editor/GUI/Windows/SaveSpringBoneSetupWindow.cs index 4e74b76..5ab245e 100755 --- a/Editor/GUI/Windows/SaveSpringBoneSetupWindow.cs +++ b/Editor/GUI/Windows/SaveSpringBoneSetupWindow.cs @@ -2,7 +2,11 @@ using System.Linq; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/GUI/Windows/SpringBoneSetupErrorWindow.cs b/Editor/GUI/Windows/SpringBoneSetupErrorWindow.cs index ca4a053..38775a9 100755 --- a/Editor/GUI/Windows/SpringBoneSetupErrorWindow.cs +++ b/Editor/GUI/Windows/SpringBoneSetupErrorWindow.cs @@ -2,7 +2,11 @@ using System.Linq; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/GUI/Windows/SpringBoneWindow.cs b/Editor/GUI/Windows/SpringBoneWindow.cs index ed29281..14ac210 100755 --- a/Editor/GUI/Windows/SpringBoneWindow.cs +++ b/Editor/GUI/Windows/SpringBoneWindow.cs @@ -2,7 +2,11 @@ using Unity.Collections; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/SpringBoneEditorActions.cs b/Editor/SpringBoneEditorActions.cs index 6ba8ad7..02ac2dd 100755 --- a/Editor/SpringBoneEditorActions.cs +++ b/Editor/SpringBoneEditorActions.cs @@ -3,7 +3,11 @@ using System.Linq; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/SpringColliderEditorActions.cs b/Editor/SpringColliderEditorActions.cs index b52dcf9..b3a8f2a 100755 --- a/Editor/SpringColliderEditorActions.cs +++ b/Editor/SpringColliderEditorActions.cs @@ -3,7 +3,11 @@ using System.Linq; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/Utility/FindGameObjectsWindow.cs b/Editor/Utility/FindGameObjectsWindow.cs index b68bd45..0e48b10 100755 --- a/Editor/Utility/FindGameObjectsWindow.cs +++ b/Editor/Utility/FindGameObjectsWindow.cs @@ -3,7 +3,11 @@ using System.Linq; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { diff --git a/Editor/Utility/SetObjectParentWindow.cs b/Editor/Utility/SetObjectParentWindow.cs index e137e49..4fc72b0 100755 --- a/Editor/Utility/SetObjectParentWindow.cs +++ b/Editor/Utility/SetObjectParentWindow.cs @@ -1,7 +1,11 @@ using System.Linq; using UnityEditor; using UnityEngine; -using UnityEditor.Localization.Editor; +#if UNITY_2020_2_OR_NEWER +using Localization = UnityEditor.L10n; +#else +using Localization = UnityEditor.Localization.Editor.Localization; +#endif namespace Unity.Animations.SpringBones { From 123bdf0ef0918f137ff65eab4513ce3f45de52b7 Mon Sep 17 00:00:00 2001 From: riina <54872398+riina@users.noreply.github.com> Date: Tue, 14 Sep 2021 15:14:19 -0700 Subject: [PATCH 2/3] Mark v1.2.0-preview.0 (unlikely name) --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcb106e..612e24d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.2.0-preview.0] - 2021-9-14 +### Changed +- Added *conditional* localization attribute definiion. Fixes editor script import on 2020.3 while preserving functions on 2019.4. + ## [1.1.0] - 2019-10-31 *This is the first version of UnityChan Spring Bone in the package form.* diff --git a/package.json b/package.json index 196b97a..a93ce39 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.springbone", "displayName": "Unity Chan Spring Bone", - "version": "1.2.0-preview", + "version": "1.2.0-preview.0", "unity": "2019.4", "description": "Sping Bone System for lightweight secondary animations.", "keywords": ["animation"], From 443811a90e0ee826e13c20072f7b7675f811598d Mon Sep 17 00:00:00 2001 From: riina <54872398+riina@users.noreply.github.com> Date: Sat, 25 Sep 2021 00:12:45 -0700 Subject: [PATCH 3/3] Adjust version to 1.2.1-preview.0 Technically based off 1.2.1-preview, but package manifest originally listed 1.2.0-preview --- CHANGELOG.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 612e24d..c01c422 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [1.2.0-preview.0] - 2021-9-14 +## [1.2.1-preview.0] - 2021-9-14 ### Changed -- Added *conditional* localization attribute definiion. Fixes editor script import on 2020.3 while preserving functions on 2019.4. +- Added *conditional* localization attribute definition. Fixes editor script import on 2020.3 while preserving functions on 2019.4. ## [1.1.0] - 2019-10-31 *This is the first version of UnityChan Spring Bone in the package form.* diff --git a/package.json b/package.json index a93ce39..d0d51cc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.springbone", "displayName": "Unity Chan Spring Bone", - "version": "1.2.0-preview.0", + "version": "1.2.1-preview.0", "unity": "2019.4", "description": "Sping Bone System for lightweight secondary animations.", "keywords": ["animation"],