diff --git a/Assets/Test/Editor/AutoBuild.cs b/Assets/Test/Editor/AutoBuild.cs new file mode 100644 index 0000000..2954e3f --- /dev/null +++ b/Assets/Test/Editor/AutoBuild.cs @@ -0,0 +1,18 @@ +using UnityEditor; + +namespace Splashdown.CI +{ + public class BuildTools + { + // Start is called before the first frame update + [MenuItem("Splashdown/build")] + public static void AutoBuild() + { + string buildPath = "Builds/iOS"; + + BuildPipeline.BuildPlayer(new[] { "Assets/Test/SampleScene.unity" }, buildPath, BuildTarget.iOS, BuildOptions.StrictMode); + } + + } +} + diff --git a/Assets/Test/Editor/AutoBuild.cs.meta b/Assets/Test/Editor/AutoBuild.cs.meta new file mode 100644 index 0000000..8f7ac0c --- /dev/null +++ b/Assets/Test/Editor/AutoBuild.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90afbfa207f944ba6bc4e3fc17749b78 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.ale1.splashdown/CHANGELOG.md b/Packages/com.ale1.splashdown/CHANGELOG.md index d836556..bf6ac56 100644 --- a/Packages/com.ale1.splashdown/CHANGELOG.md +++ b/Packages/com.ale1.splashdown/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog ## com.ale1.Splashdown +## [1.2.4] +### Added +- Test assembly folder in Splashdown package +### Changed +- Bumped unity editor version to 2021.3.34 + ##[1.2.3] ### Added - Wildcard character allowd in splashdown provider attribute filter diff --git a/Packages/com.ale1.splashdown/Editor/Scripts/SplashdownImporterEditor.cs b/Packages/com.ale1.splashdown/Editor/Scripts/SplashdownImporterEditor.cs index fd9f0dc..4fd7bcc 100644 --- a/Packages/com.ale1.splashdown/Editor/Scripts/SplashdownImporterEditor.cs +++ b/Packages/com.ale1.splashdown/Editor/Scripts/SplashdownImporterEditor.cs @@ -192,7 +192,6 @@ public override void OnInspectorGUI() } else { - EditorGUI.BeginDisabledGroup(true); EditorGUILayout.LabelField("Using Font:", $"Splashdown Default ({Constants.DefaultFontName})"); EditorGUI.EndDisabledGroup(); diff --git a/Packages/com.ale1.splashdown/LICENSE.md b/Packages/com.ale1.splashdown/LICENSE.md index 3abf3bd..1f1256f 100644 --- a/Packages/com.ale1.splashdown/LICENSE.md +++ b/Packages/com.ale1.splashdown/LICENSE.md @@ -1,6 +1,8 @@ # LICENCE -**Copyright 2023 - Alejandro Barbero - https://github.com/Ale1** +**Copyright 2023 - Alejandro Barbero - https://github.com/Ale1/Splashdown** + +License Type: "MIT" Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/Packages/com.ale1.splashdown/Runtime/Constants.cs b/Packages/com.ale1.splashdown/Runtime/Constants.cs index 6d5e477..4b945af 100644 --- a/Packages/com.ale1.splashdown/Runtime/Constants.cs +++ b/Packages/com.ale1.splashdown/Runtime/Constants.cs @@ -20,7 +20,5 @@ public static class Constants public const int DefaultWidth = 360; public const int DefaultHeight = 360; public const int DefaultSplashtime = 4; //seconds - - } -} +} \ No newline at end of file diff --git a/Packages/com.ale1.splashdown/Tests.meta b/Packages/com.ale1.splashdown/Tests.meta new file mode 100644 index 0000000..d3d4aab --- /dev/null +++ b/Packages/com.ale1.splashdown/Tests.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab0be43e6a628491c95ae5f72b0bd08d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.ale1.splashdown/Tests/Editor.meta b/Packages/com.ale1.splashdown/Tests/Editor.meta new file mode 100644 index 0000000..400bca1 --- /dev/null +++ b/Packages/com.ale1.splashdown/Tests/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32ede6a5f23304b25b451de9ca2851b1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.ale1.splashdown/Tests/Editor/SplashdownTests.cs b/Packages/com.ale1.splashdown/Tests/Editor/SplashdownTests.cs new file mode 100644 index 0000000..4124edd --- /dev/null +++ b/Packages/com.ale1.splashdown/Tests/Editor/SplashdownTests.cs @@ -0,0 +1,33 @@ +using NUnit.Framework; +using System.IO; +using UnityEngine; + +namespace Splashdown.Tests +{ + [TestFixture] + public class SplashdownTests + { + private string _projectRoot; + + [SetUp] + public void Setup() + { + _projectRoot = Path.GetDirectoryName(Application.dataPath); + } + + [Test][Category("Constants")] + public void FontPath_Roboto_Exists() + { + var path = Path.Combine(_projectRoot, Constants.FontPath_Roboto); + Assert.IsTrue(File.Exists(path), $"Font file at path {path} does not exist."); + } + + [Test][Category("Constants")] + public void FontPath_NanumGothic_Exists() + { + var path = Path.Combine(_projectRoot, Constants.FontPath_NanumGothic); + Assert.IsTrue(File.Exists(path), $"Font file at path {path} does not exist."); + } + } +} + diff --git a/Packages/com.ale1.splashdown/Tests/Editor/SplashdownTests.cs.meta b/Packages/com.ale1.splashdown/Tests/Editor/SplashdownTests.cs.meta new file mode 100644 index 0000000..0870273 --- /dev/null +++ b/Packages/com.ale1.splashdown/Tests/Editor/SplashdownTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ea1e3d18deeb84ebe8e87283e729d0e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.ale1.splashdown/Tests/Editor/Tests.asmdef b/Packages/com.ale1.splashdown/Tests/Editor/Tests.asmdef new file mode 100644 index 0000000..37d0a5c --- /dev/null +++ b/Packages/com.ale1.splashdown/Tests/Editor/Tests.asmdef @@ -0,0 +1,24 @@ +{ + "name": "Tests", + "rootNamespace": "", + "references": [ + "UnityEngine.TestRunner", + "UnityEditor.TestRunner", + "Splashdown" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "nunit.framework.dll" + ], + "autoReferenced": false, + "defineConstraints": [ + "UNITY_INCLUDE_TESTS" + ], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Packages/com.ale1.splashdown/Tests/Editor/Tests.asmdef.meta b/Packages/com.ale1.splashdown/Tests/Editor/Tests.asmdef.meta new file mode 100644 index 0000000..aee6d38 --- /dev/null +++ b/Packages/com.ale1.splashdown/Tests/Editor/Tests.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d797012bc179f47ea903daf4778a10b1 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.ale1.splashdown/package.json b/Packages/com.ale1.splashdown/package.json index ee5e7e6..4cae612 100644 --- a/Packages/com.ale1.splashdown/package.json +++ b/Packages/com.ale1.splashdown/package.json @@ -1,8 +1,8 @@ { "name": "com.ale1.splashdown", - "version": "1.2.3", + "version": "1.2.4", "displayName": "Splashdown", - "description": "A unity open-source custom Splash splash and Icon generator", + "description": "A unity open-source custom Splash splash and Icon generator. \nSee https://github.com/Ale1/Splashdown for usage instructions.", "documentationUrl": "https://github.com/Ale1/Splashdown", "changelogUrl": "CHANGELOG.MD", "licenseUrl": "LICENCE.MD", diff --git a/Packages/manifest.json b/Packages/manifest.json index c97d908..5781b3f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,12 @@ { "dependencies": { - "com.unity.collab-proxy": "2.0.7", + "com.unity.collab-proxy": "2.2.0", "com.unity.feature.2d": "2.0.0", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.20", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", + "com.unity.textmeshpro": "3.0.9", "com.unity.timeline": "1.6.5", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 269284d..8da407b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,11 +7,11 @@ "dependencies": {} }, "com.unity.2d.animation": { - "version": "7.0.11", + "version": "7.0.13", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.6", + "com.unity.2d.common": "6.0.7", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -19,26 +19,26 @@ "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.0.0", + "version": "1.1.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.sprite": "1.0.0", "com.unity.2d.common": "6.0.6", + "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.2.6", "com.unity.modules.animation": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "6.0.6", + "version": "6.0.7", "depth": 2, "source": "registry", "dependencies": { + "com.unity.burst": "1.5.1", "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.1.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.burst": "1.5.1" + "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -57,13 +57,13 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "6.0.7", + "version": "6.0.8", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.animation": "7.0.9", - "com.unity.2d.common": "6.0.6", - "com.unity.2d.sprite": "1.0.0" + "com.unity.2d.common": "6.0.7", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.animation": "7.0.13" }, "url": "https://packages.unity.com" }, @@ -78,9 +78,9 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "6.0.6", "com.unity.2d.path": "5.0.2", + "com.unity.2d.common": "6.0.6", + "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -92,19 +92,19 @@ "dependencies": {} }, "com.unity.2d.tilemap.extras": { - "version": "2.2.6", + "version": "2.2.7", "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.tilemap": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", "com.unity.ugui": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.11", "depth": 3, "source": "registry", "dependencies": { @@ -113,7 +113,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.7", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -131,18 +131,18 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "7.0.11", + "com.unity.2d.animation": "7.0.13", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "6.0.7", + "com.unity.2d.psdimporter": "6.0.8", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.spriteshape": "7.0.7", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "2.2.6", - "com.unity.2d.aseprite": "1.0.0" + "com.unity.2d.tilemap.extras": "2.2.7", + "com.unity.2d.aseprite": "1.1.0" } }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { @@ -151,7 +151,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.20", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -185,7 +185,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.9", "depth": 0, "source": "registry", "dependencies": { @@ -198,9 +198,9 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 780483a..4b03356 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -753,7 +753,6 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 3 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index db3863a..03cda39 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.29f1 -m_EditorVersionWithRevision: 2021.3.29f1 (204d6dc9ae1c) +m_EditorVersion: 2021.3.34f1 +m_EditorVersionWithRevision: 2021.3.34f1 (25266724e7bd)