diff --git a/README.md b/README.md index 7a8ebf1f..a64405af 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # nimbus-unity -## NimbusUnity.unitypackage - -The latest NimbusUnity.unitypackage can be downloaded from the [Releases](https://github.com/timehop/nimbus-unity/releases) page +The latest [package](package) can be downloaded from the [Releases](https://github.com/timehop/nimbus-unity/releases) page ## Minimum Requirements diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Editor.meta b/package/Editor.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Editor.meta rename to package/Editor.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Editor/AndroidPostBuildProcessor.cs b/package/Editor/AndroidPostBuildProcessor.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Editor/AndroidPostBuildProcessor.cs rename to package/Editor/AndroidPostBuildProcessor.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Editor/AndroidPostBuildProcessor.cs.meta b/package/Editor/AndroidPostBuildProcessor.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Editor/AndroidPostBuildProcessor.cs.meta rename to package/Editor/AndroidPostBuildProcessor.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Editor/editor.asmdef b/package/Editor/editor.asmdef similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Editor/editor.asmdef rename to package/Editor/editor.asmdef diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Editor/editor.asmdef.meta b/package/Editor/editor.asmdef.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Editor/editor.asmdef.meta rename to package/Editor/editor.asmdef.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime.meta b/package/Runtime.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime.meta rename to package/Runtime.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs.meta b/package/Runtime/NimbusManagerPrefabs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs.meta rename to package/Runtime/NimbusManagerPrefabs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs/NimbusAdsManager.prefab b/package/Runtime/NimbusManagerPrefabs/NimbusAdsManager.prefab similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs/NimbusAdsManager.prefab rename to package/Runtime/NimbusManagerPrefabs/NimbusAdsManager.prefab diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs/NimbusAdsManager.prefab.meta b/package/Runtime/NimbusManagerPrefabs/NimbusAdsManager.prefab.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs/NimbusAdsManager.prefab.meta rename to package/Runtime/NimbusManagerPrefabs/NimbusAdsManager.prefab.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs/NimbusAdsManagerWithEventSubsciptions.prefab b/package/Runtime/NimbusManagerPrefabs/NimbusAdsManagerWithEventSubsciptions.prefab similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs/NimbusAdsManagerWithEventSubsciptions.prefab rename to package/Runtime/NimbusManagerPrefabs/NimbusAdsManagerWithEventSubsciptions.prefab diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs/NimbusAdsManagerWithEventSubsciptions.prefab.meta b/package/Runtime/NimbusManagerPrefabs/NimbusAdsManagerWithEventSubsciptions.prefab.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/NimbusManagerPrefabs/NimbusAdsManagerWithEventSubsciptions.prefab.meta rename to package/Runtime/NimbusManagerPrefabs/NimbusAdsManagerWithEventSubsciptions.prefab.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Plugins.meta b/package/Runtime/Plugins.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Plugins.meta rename to package/Runtime/Plugins.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Plugins/Android.meta b/package/Runtime/Plugins/Android.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Plugins/Android.meta rename to package/Runtime/Plugins/Android.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Plugins/Android/UnityHelper.java b/package/Runtime/Plugins/Android/UnityHelper.java similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Plugins/Android/UnityHelper.java rename to package/Runtime/Plugins/Android/UnityHelper.java diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Plugins/Android/UnityHelper.java.meta b/package/Runtime/Plugins/Android/UnityHelper.java.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Plugins/Android/UnityHelper.java.meta rename to package/Runtime/Plugins/Android/UnityHelper.java.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts.meta b/package/Runtime/Scripts.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts.meta rename to package/Runtime/Scripts.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal.meta b/package/Runtime/Scripts/Internal.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal.meta rename to package/Runtime/Scripts/Internal.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/AdEvents.cs b/package/Runtime/Scripts/Internal/AdEvents.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/AdEvents.cs rename to package/Runtime/Scripts/Internal/AdEvents.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/AdEvents.cs.meta b/package/Runtime/Scripts/Internal/AdEvents.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/AdEvents.cs.meta rename to package/Runtime/Scripts/Internal/AdEvents.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/Android.cs b/package/Runtime/Scripts/Internal/Android.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/Android.cs rename to package/Runtime/Scripts/Internal/Android.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/Android.cs.meta b/package/Runtime/Scripts/Internal/Android.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/Android.cs.meta rename to package/Runtime/Scripts/Internal/Android.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/Editor.cs b/package/Runtime/Scripts/Internal/Editor.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/Editor.cs rename to package/Runtime/Scripts/Internal/Editor.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/Editor.cs.meta b/package/Runtime/Scripts/Internal/Editor.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/Editor.cs.meta rename to package/Runtime/Scripts/Internal/Editor.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/IAdEvents.cs b/package/Runtime/Scripts/Internal/IAdEvents.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/IAdEvents.cs rename to package/Runtime/Scripts/Internal/IAdEvents.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/IAdEvents.cs.meta b/package/Runtime/Scripts/Internal/IAdEvents.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/IAdEvents.cs.meta rename to package/Runtime/Scripts/Internal/IAdEvents.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/JavaAdManagerEventProxy.cs b/package/Runtime/Scripts/Internal/JavaAdManagerEventProxy.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/JavaAdManagerEventProxy.cs rename to package/Runtime/Scripts/Internal/JavaAdManagerEventProxy.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/JavaAdManagerEventProxy.cs.meta b/package/Runtime/Scripts/Internal/JavaAdManagerEventProxy.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/JavaAdManagerEventProxy.cs.meta rename to package/Runtime/Scripts/Internal/JavaAdManagerEventProxy.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAPI.cs b/package/Runtime/Scripts/Internal/NimbusAPI.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAPI.cs rename to package/Runtime/Scripts/Internal/NimbusAPI.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAPI.cs.meta b/package/Runtime/Scripts/Internal/NimbusAPI.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAPI.cs.meta rename to package/Runtime/Scripts/Internal/NimbusAPI.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAdUnit.cs b/package/Runtime/Scripts/Internal/NimbusAdUnit.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAdUnit.cs rename to package/Runtime/Scripts/Internal/NimbusAdUnit.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAdUnit.cs.meta b/package/Runtime/Scripts/Internal/NimbusAdUnit.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAdUnit.cs.meta rename to package/Runtime/Scripts/Internal/NimbusAdUnit.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAdUnityType.cs b/package/Runtime/Scripts/Internal/NimbusAdUnityType.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAdUnityType.cs rename to package/Runtime/Scripts/Internal/NimbusAdUnityType.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAdUnityType.cs.meta b/package/Runtime/Scripts/Internal/NimbusAdUnityType.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/Internal/NimbusAdUnityType.cs.meta rename to package/Runtime/Scripts/Internal/NimbusAdUnityType.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/NimbusManager.cs b/package/Runtime/Scripts/NimbusManager.cs similarity index 99% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/NimbusManager.cs rename to package/Runtime/Scripts/NimbusManager.cs index 0affd328..f523ad38 100644 --- a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/NimbusManager.cs +++ b/package/Runtime/Scripts/NimbusManager.cs @@ -42,7 +42,7 @@ private void Awake() { } private IEnumerator Start() { - if (!shouldSubscribeToIAdEvents) yield return null; + if (!shouldSubscribeToIAdEvents) yield break; yield return new WaitForEndOfFrame(); var eventsFound = false; var iAdEvents = FindObjectsOfType().OfType(); diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/NimbusManager.cs.meta b/package/Runtime/Scripts/NimbusManager.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/NimbusManager.cs.meta rename to package/Runtime/Scripts/NimbusManager.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects.meta b/package/Runtime/Scripts/ScriptableObjects.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects.meta rename to package/Runtime/Scripts/ScriptableObjects.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects/NimbusSDKConfiguration.cs b/package/Runtime/Scripts/ScriptableObjects/NimbusSDKConfiguration.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects/NimbusSDKConfiguration.cs rename to package/Runtime/Scripts/ScriptableObjects/NimbusSDKConfiguration.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects/NimbusSDKConfiguration.cs.meta b/package/Runtime/Scripts/ScriptableObjects/NimbusSDKConfiguration.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects/NimbusSDKConfiguration.cs.meta rename to package/Runtime/Scripts/ScriptableObjects/NimbusSDKConfiguration.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects/NimbusSDKDevExample.asset b/package/Runtime/Scripts/ScriptableObjects/NimbusSDKDevExample.asset similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects/NimbusSDKDevExample.asset rename to package/Runtime/Scripts/ScriptableObjects/NimbusSDKDevExample.asset diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects/NimbusSDKDevExample.asset.meta b/package/Runtime/Scripts/ScriptableObjects/NimbusSDKDevExample.asset.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/ScriptableObjects/NimbusSDKDevExample.asset.meta rename to package/Runtime/Scripts/ScriptableObjects/NimbusSDKDevExample.asset.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/UnityThread.cs b/package/Runtime/Scripts/UnityThread.cs similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/UnityThread.cs rename to package/Runtime/Scripts/UnityThread.cs diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/UnityThread.cs.meta b/package/Runtime/Scripts/UnityThread.cs.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/Runtime/Scripts/UnityThread.cs.meta rename to package/Runtime/Scripts/UnityThread.cs.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/nimbus.asmdef b/package/nimbus.asmdef similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/nimbus.asmdef rename to package/nimbus.asmdef diff --git a/sample-app/Packages/AdsByNimbus/Nimbus/nimbus.asmdef.meta b/package/nimbus.asmdef.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/Nimbus/nimbus.asmdef.meta rename to package/nimbus.asmdef.meta diff --git a/sample-app/Packages/AdsByNimbus/package.json b/package/package.json similarity index 86% rename from sample-app/Packages/AdsByNimbus/package.json rename to package/package.json index 8f24c734..3916e310 100644 --- a/sample-app/Packages/AdsByNimbus/package.json +++ b/package/package.json @@ -1,6 +1,6 @@ { - "name": "com.nimbus", - "version": "0.0.1", + "name": "com.adsbynimbus", + "version": "0.2.0", "displayName": "Ads By Nimbus", "description": "This package allows for Unity games to access ads driven by Nimbus", "unity": "2018.4", diff --git a/sample-app/Packages/AdsByNimbus/package.json.meta b/package/package.json.meta similarity index 100% rename from sample-app/Packages/AdsByNimbus/package.json.meta rename to package/package.json.meta diff --git a/sample-app/Packages/AdsByNimbus/Nimbus.meta b/sample-app/Packages/AdsByNimbus/Nimbus.meta deleted file mode 100644 index 69e19dc2..00000000 --- a/sample-app/Packages/AdsByNimbus/Nimbus.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec5b2c1b00e1641f585a2e545aeb9eee -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/sample-app/Packages/manifest.json b/sample-app/Packages/manifest.json index 1675e467..14dab3eb 100644 --- a/sample-app/Packages/manifest.json +++ b/sample-app/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.adsbynimbus": "file:../../package", "com.unity.2d.animation": "2.0.0-preview.3", "com.unity.analytics": "3.2.3", "com.unity.cinemachine": "2.7.3",