Merge pull request #45 from /issues/44

Issues/44 Not working on Unity 2018.3.3f1 #44

.gitignore

@@ -36,3 +36,4 @@ sysinfo.txt
 Assets/Plugins/Editor.meta
 Assets/Plugins/Editor/
 
+Logs/

Assets/Editor/Test/FileCacheTest.cs

@@ -184,7 +184,7 @@ public FileCacheForTest(GameObject gameObject, string rootDirectory, ICacheEncod
             {
             }
 
-            protected override UniRx.IObservable<Command> AsyncSetCommandGetCacheByPath(UniRx.IObservable<Command> observable)
+            protected override IObservable<Command> AsyncSetCommandGetCacheByPath(IObservable<Command> observable)
             {
                 return observable.Select(_command => this.SetCommandGetCacheByPath(_command));
             }
@@ -197,7 +197,7 @@ protected override void AsyncDeleteAndSetCache(GameObject obj, Command command)
 
         class TestCacheHandler : ICacheHandler
         {
-            public UniRx.IObservable<byte[]> Fetch(string key)
+            public IObservable<byte[]> Fetch(string key)
             {
                 if (key.Equals("foo"))
                 {

Assets/Plugins/Unicache/Scripts/FileCache.cs

@@ -54,7 +54,7 @@ public FileCache(GameObject gameObject, string rootDirectory, ICacheEncoderDecod
             this.BuildQueue(gameObject);
         }
 
-        public UniRx.IObservable<byte[]> Fetch(string key)
+        public IObservable<byte[]> Fetch(string key)
         {
             var url = this.UrlLocator.CreateUrl(key);
             var path = this.CacheLocator.CreateCachePath(key);
@@ -165,8 +165,8 @@ private void BuildQueue(GameObject obj)
                 .AddTo(obj);
         }
 
-        protected virtual UniRx.IObservable<Command> AsyncSetCommandGetCacheByPath(
-            UniRx.IObservable<Command> observable)
+        protected virtual IObservable<Command> AsyncSetCommandGetCacheByPath(
+            IObservable<Command> observable)
         {
             return observable
                     .ObserveOn(Scheduler.ThreadPool)

Assets/Plugins/Unicache/Scripts/ICacheHandler.cs

@@ -1,4 +1,4 @@
-using UniRx;
+using System;
 
 namespace Unicache
 {

Assets/Plugins/Unicache/Scripts/IUnicache.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using UniRx;
+using System;
+using System.Collections.Generic;
 
 namespace Unicache
 {

Assets/Plugins/Unicache/Scripts/MemoryCache.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Unicache.Plugin;
 using UniRx;
 

Assets/Plugins/Unicache/Scripts/Plugin/IObservableExtension.cs

@@ -1,4 +1,5 @@
-using UniRx;
+using System;
+using UniRx;
 using UnityEngine;
 
 namespace Unicache.Plugin

Assets/Plugins/Unicache/Scripts/Plugin/SimpleDownloadHandler.cs

@@ -22,7 +22,7 @@ private IEnumerator FetchCoroutine(string url, Action<byte[]> callback, Action<E
         {
             UnityWebRequest request = UnityWebRequest.Get(url);
 
-            yield return request.Send();
+            yield return request.SendWebRequest();
 
             if (isSuccess(request))
             {

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2017.1.1f1
+m_EditorVersion: 2018.3.5f1