ready for 6.2.2

neuecc · neuecc · commit 89b406c6e88c · 2018-09-12T23:35:14.000+09:00
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;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`	`using System.Collections;`
`3`	`3`	`using System.Threading;`
`4`	`4`	`using UnityEngine;`
	`5`	`+#if UNITY_2018_3_OR_NEWER`
`5`	`6`	`#pragma warning disable CS0618`
	`7`	`+#endif`
`6`	`8`
`7`	`9`	`namespace UniRx.Examples`
`8`	`10`	`{`
`@@ -38,4 +40,6 @@ static IEnumerator GetWWWCore(string url, IObserver<string> observer, Cancellati`
`38`	`40`	`}`
`39`	`41`	`}`
`40`	`42`	`}`
`41`		`-#pragma warning restore CS0618`
	`43`	`+#if UNITY_2018_3_OR_NEWER`
	`44`	`+#pragma warning restore CS0618`
	`45`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,9 @@ IEnumerator ComplexCoroutineTest()`
`31`	`31`	`// You can use ToYieldInstruction.`
`32`	`32`
`33`	`33`	`#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)`
	`34`	`+#if UNITY_2018_3_OR_NEWER`
`34`	`35`	`#pragma warning disable CS0618`
	`36`	`+#endif`
`35`	`37`
`36`	`38`	`IEnumerator TestNewCustomYieldInstruction()`
`37`	`39`	`{`
`@@ -51,7 +53,9 @@ IEnumerator TestNewCustomYieldInstruction()`
`51`	`53`	`// other sample(wait until transform.position.y >= 100)`
`52`	`54`	`yield return this.ObserveEveryValueChanged(x => x.transform).FirstOrDefault(x => x.position.y >= 100).ToYieldInstruction();`
`53`	`55`	`}`
	`56`	`+#if UNITY_2018_3_OR_NEWER`
`54`	`57`	`#pragma warning restore CS0618`
	`58`	`+#endif`
`55`	`59`	`#endif`
`56`	`60`
`57`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-UniRx - Reactive Extensions for Unity / Ver 6.2.1`
	`1`	`+UniRx - Reactive Extensions for Unity / Ver 6.2.2`
`2`	`2`	`===`
`3`	`3`	`Created by Yoshifumi Kawai(neuecc)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ public static ResourceRequestAwaiter GetAwaiter(this ResourceRequest resourceReq`
`61`	`61`
`62`	`62`	`#if ENABLE_WWW`
`63`	`63`
	`64`	`+#if UNITY_2018_3_OR_NEWER`
`64`	`65`	`#pragma warning disable CS0618`
	`66`	`+#endif`
`65`	`67`
`66`	`68`	`public static IAwaiter GetAwaiter(this WWW www)`
`67`	`69`	`{`
`@@ -99,7 +101,9 @@ public static UniTask ToUniTask(this WWW www)`
`99`	`101`	`return new UniTask(awaiter);`
`100`	`102`	`}`
`101`	`103`
	`104`	`+#if UNITY_2018_3_OR_NEWER`
`102`	`105`	`#pragma warning restore CS0618`
	`106`	`+#endif`
`103`	`107`
`104`	`108`	`#endif`
`105`	`109`
`@@ -434,7 +438,9 @@ public void UnsafeOnCompleted(Action continuation)`
`434`	`438`
`435`	`439`	`#if ENABLE_WWW`
`436`	`440`
	`441`	`+#if UNITY_2018_3_OR_NEWER`
`437`	`442`	`#pragma warning disable CS0618`
	`443`	`+#endif`
`438`	`444`
`439`	`445`	`class WWWConfiguredAwaiter : IAwaiter, IPlayerLoopItem`
`440`	`446`	`{`
`@@ -526,7 +532,9 @@ public void UnsafeOnCompleted(Action continuation)`
`526`	`532`	`}`
`527`	`533`	`}`
`528`	`534`
	`535`	`+#if UNITY_2018_3_OR_NEWER`
`529`	`536`	`#pragma warning restore CS0618`
	`537`	`+#endif`
`530`	`538`
`531`	`539`	`#endif`
`532`	`540`
Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,17 @@ public static CoroutineAsyncBridge GetAwaiter(this Coroutine coroutine)`
`95`	`95`
`96`	`96`	`// should use UniRx.Async in C# 7.0`
`97`	`97`
	`98`	`+#if UNITY_2018_3_OR_NEWER`
`98`	`99`	`#pragma warning disable CS0618`
	`100`	`+#endif`
`99`	`101`	`public static CoroutineAsyncBridge<WWW> GetAwaiter(this WWW www)`
`100`	`102`	`{`
`101`	`103`	`return CoroutineAsyncBridge<WWW>.Start(www);`
`102`	`104`	`}`
	`105`	`+#if UNITY_2018_3_OR_NEWER`
`103`	`106`	`#pragma warning restore CS0618`
	`107`	`+#endif`
	`108`	`+`
`104`	`109`
`105`	`110`
`106`	`111`	`public static CoroutineAsyncBridge<AsyncOperation> GetAwaiter(this AsyncOperation asyncOperation)`
Original file line number	Diff line number	Diff line change
`@@ -117,14 +117,18 @@ void ConsumeEnumerator(IEnumerator routine)`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`var type = current.GetType();`
`120`		`- #pragma warning disable CS0618`
	`120`	`+#if UNITY_2018_3_OR_NEWER`
	`121`	`+#pragma warning disable CS0618`
	`122`	`+#endif`
`121`	`123`	`if (type == typeof(WWW))`
`122`	`124`	`{`
`123`	`125`	`var www = (WWW)current;`
`124`	`126`	`editorQueueWorker.Enqueue(_ => ConsumeEnumerator(UnwrapWaitWWW(www, routine)), null);`
`125`	`127`	`return;`
`126`	`128`	`}`
`127`		`- #pragma warning restore CS0618`
	`129`	`+#if UNITY_2018_3_OR_NEWER`
	`130`	`+#pragma warning restore CS0618`
	`131`	`+#endif`
`128`	`132`	`else if (type == typeof(AsyncOperation))`
`129`	`133`	`{`
`130`	`134`	`var asyncOperation = (AsyncOperation)current;`
`@@ -158,7 +162,9 @@ void ConsumeEnumerator(IEnumerator routine)`
`158`	`162`	`}`
`159`	`163`	`}`
`160`	`164`
`161`		`- #pragma warning disable CS0618`
	`165`	`+#if UNITY_2018_3_OR_NEWER`
	`166`	`+#pragma warning disable CS0618`
	`167`	`+#endif`
`162`	`168`	`IEnumerator UnwrapWaitWWW(WWW www, IEnumerator continuation)`
`163`	`169`	`{`
`164`	`170`	`while (!www.isDone)`
`@@ -167,7 +173,9 @@ IEnumerator UnwrapWaitWWW(WWW www, IEnumerator continuation)`
`167`	`173`	`}`
`168`	`174`	`ConsumeEnumerator(continuation);`
`169`	`175`	`}`
`170`		`- #pragma warning restore CS0618`
	`176`	`+#if UNITY_2018_3_OR_NEWER`
	`177`	`+#pragma warning restore CS0618`
	`178`	`+#endif`
`171`	`179`
`172`	`180`	`IEnumerator UnwrapWaitAsyncOperation(AsyncOperation asyncOperation, IEnumerator continuation)`
`173`	`181`	`{`