ready for 6.2.2

neuecc · Sep 12, 2018 · 89b406c · 89b406c
1 parent 4e780c2
commit 89b406c
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 17 deletions.
diff --git a/Assets/Plugins/UniRx/Examples/Sample01_ObservableWWW.cs b/Assets/Plugins/UniRx/Examples/Sample01_ObservableWWW.cs
@@ -1,5 +1,8 @@
 #if !(UNITY_METRO || UNITY_WP8)
+
+#if UNITY_2018_3_OR_NEWER
 #pragma warning disable CS0618
+#endif
 
 using UnityEngine;
 
@@ -81,4 +84,7 @@ from bing in ObservableWWW.Get("http://bing.com/")
 }
 
 #endif
-#pragma warning restore CS0618
+
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif
diff --git a/Assets/Plugins/UniRx/Examples/Sample05_ConvertFromCoroutine.cs b/Assets/Plugins/UniRx/Examples/Sample05_ConvertFromCoroutine.cs
@@ -2,7 +2,9 @@
 using System.Collections;
 using System.Threading;
 using UnityEngine;
+#if UNITY_2018_3_OR_NEWER
 #pragma warning disable CS0618
+#endif
 
 namespace UniRx.Examples
 {
@@ -38,4 +40,6 @@ static IEnumerator GetWWWCore(string url, IObserver<string> observer, Cancellati
         }
     }
 }
-#pragma warning restore CS0618
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif
diff --git a/Assets/Plugins/UniRx/Examples/Sample06_ConvertToCoroutine.cs b/Assets/Plugins/UniRx/Examples/Sample06_ConvertToCoroutine.cs
@@ -31,7 +31,9 @@ IEnumerator ComplexCoroutineTest()
         // You can use ToYieldInstruction.
 
 #if !(UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5_0 || UNITY_5_1 || UNITY_5_2)
+#if UNITY_2018_3_OR_NEWER
 #pragma warning disable CS0618
+#endif
 
         IEnumerator TestNewCustomYieldInstruction()
         {
@@ -51,7 +53,9 @@ IEnumerator TestNewCustomYieldInstruction()
             // other sample(wait until transform.position.y >= 100) 
             yield return this.ObserveEveryValueChanged(x => x.transform).FirstOrDefault(x => x.position.y >= 100).ToYieldInstruction();
         }
+#if UNITY_2018_3_OR_NEWER
 #pragma warning restore CS0618
+#endif
 #endif
 
     }

diff --git a/Assets/Plugins/UniRx/ReadMe.txt b/Assets/Plugins/UniRx/ReadMe.txt
@@ -1,4 +1,4 @@
-UniRx - Reactive Extensions for Unity / Ver 6.2.1
+UniRx - Reactive Extensions for Unity / Ver 6.2.2
 ===
 Created by Yoshifumi Kawai(neuecc)
 

diff --git a/Assets/Plugins/UniRx/Scripts/Async/CancellationTokenEqualityComparer.cs b/Assets/Plugins/UniRx/Scripts/Async/CancellationTokenEqualityComparer.cs
@@ -1,5 +1,6 @@
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
 using System.Collections.Generic;
 using System.Threading;
 

diff --git a/Assets/Plugins/UniRx/Scripts/Async/Internal/MinimumQueue.cs b/Assets/Plugins/UniRx/Scripts/Async/Internal/MinimumQueue.cs
@@ -1,4 +1,6 @@
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+#endif
 
 using System;
 using System.Runtime.CompilerServices;

diff --git a/Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.cs b/Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.cs
@@ -61,7 +61,9 @@ public static ResourceRequestAwaiter GetAwaiter(this ResourceRequest resourceReq
 
 #if ENABLE_WWW
 
+#if UNITY_2018_3_OR_NEWER
 #pragma warning disable CS0618
+#endif
 
         public static IAwaiter GetAwaiter(this WWW www)
         {
@@ -99,7 +101,9 @@ public static UniTask ToUniTask(this WWW www)
             return new UniTask(awaiter);
         }
 
+#if UNITY_2018_3_OR_NEWER
 #pragma warning restore CS0618
+#endif
 
 #endif
 
@@ -434,7 +438,9 @@ public void UnsafeOnCompleted(Action continuation)
 
 #if ENABLE_WWW
 
+#if UNITY_2018_3_OR_NEWER
 #pragma warning disable CS0618
+#endif
 
         class WWWConfiguredAwaiter : IAwaiter, IPlayerLoopItem
         {
@@ -526,7 +532,9 @@ public void UnsafeOnCompleted(Action continuation)
             }
         }
 
+#if UNITY_2018_3_OR_NEWER
 #pragma warning restore CS0618
+#endif
 
 #endif
 

diff --git a/Assets/Plugins/UniRx/Scripts/Async/UnityEqualityComparer.cs b/Assets/Plugins/UniRx/Scripts/Async/UnityEqualityComparer.cs
@@ -1,4 +1,6 @@
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+#endif
 
 using System;
 using System.Collections.Generic;
@@ -80,6 +82,7 @@ static object GetDefaultHelper(Type type)
             if (t.Equals(vector3Type)) return (object)UnityEqualityComparer.Vector3;
             if (t.Equals(vector4Type)) return (object)UnityEqualityComparer.Vector4;
             if (t.Equals(colorType)) return (object)UnityEqualityComparer.Color;
+            if (t.Equals(color32Type)) return (object)UnityEqualityComparer.Color32;
             if (t.Equals(rectType)) return (object)UnityEqualityComparer.Rect;
             if (t.Equals(boundsType)) return (object)UnityEqualityComparer.Bounds;
             if (t.Equals(quaternionType)) return (object)UnityEqualityComparer.Quaternion;

diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/CoroutineAsyncBridge.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/CoroutineAsyncBridge.cs
@@ -95,12 +95,17 @@ public static CoroutineAsyncBridge GetAwaiter(this Coroutine coroutine)
 
         // should use UniRx.Async in C# 7.0
 
+#if UNITY_2018_3_OR_NEWER
 #pragma warning disable CS0618
+#endif
         public static CoroutineAsyncBridge<WWW> GetAwaiter(this WWW www)
         {
             return CoroutineAsyncBridge<WWW>.Start(www);
         }
+#if UNITY_2018_3_OR_NEWER
 #pragma warning restore CS0618
+#endif
+
 
 
         public static CoroutineAsyncBridge<AsyncOperation> GetAwaiter(this AsyncOperation asyncOperation)

diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/MainThreadDispatcher.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/MainThreadDispatcher.cs
@@ -117,14 +117,18 @@ void ConsumeEnumerator(IEnumerator routine)
                     }
 
                     var type = current.GetType();
-                    #pragma warning disable CS0618
+#if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
                     if (type == typeof(WWW))
                     {
                         var www = (WWW)current;
                         editorQueueWorker.Enqueue(_ => ConsumeEnumerator(UnwrapWaitWWW(www, routine)), null);
                         return;
                     }
-                    #pragma warning restore CS0618
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif
                     else if (type == typeof(AsyncOperation))
                     {
                         var asyncOperation = (AsyncOperation)current;
@@ -158,7 +162,9 @@ void ConsumeEnumerator(IEnumerator routine)
                 }
             }
 
-            #pragma warning disable CS0618
+#if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
             IEnumerator UnwrapWaitWWW(WWW www, IEnumerator continuation)
             {
                 while (!www.isDone)
@@ -167,7 +173,9 @@ IEnumerator UnwrapWaitWWW(WWW www, IEnumerator continuation)
                 }
                 ConsumeEnumerator(continuation);
             }
-            #pragma warning restore CS0618
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif
 
             IEnumerator UnwrapWaitAsyncOperation(AsyncOperation asyncOperation, IEnumerator continuation)
             {

diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Observable.Unity.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Observable.Unity.cs
@@ -229,9 +229,13 @@ public static partial class Observable
     {
         readonly static HashSet<Type> YieldInstructionTypes = new HashSet<Type>
         {
-            #pragma warning disable CS0618
+            #if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
             typeof(WWW),
-            #pragma warning restore CS0618
+            #if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif
             typeof(WaitForEndOfFrame),
             typeof(WaitForFixedUpdate),
             typeof(WaitForSeconds),

diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/ObservableWWW.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/ObservableWWW.cs
@@ -6,7 +6,9 @@
 using ObservableUnity = UniRx.Observable;
 #endif
 
+#if UNITY_2018_3_OR_NEWER
 #pragma warning disable CS0618
+#endif
 
 namespace UniRx
 {
@@ -435,4 +437,6 @@ public override string ToString()
     }
 }
 
-#pragma warning restore CS0618
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif
diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/ReactiveProperty.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/ReactiveProperty.cs
@@ -1,4 +1,6 @@
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+#endif
 
 using System;
 using System.Collections.Generic;

diff --git a/Assets/Scripts/Sandbox/SandboxScene.cs b/Assets/Scripts/Sandbox/SandboxScene.cs
@@ -1,5 +1,5 @@
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 using System;
 using System.Threading;
 using System.Threading.Tasks;