Embedded proguard.txt file to AAR library which should get rid of Cla…

…ssNotFoundExceptions automatically
yasirkula · Apr 12, 2021 · 4901b85 · 4901b85
1 parent 5f469e7
commit 4901b85
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 6 deletions.
diff --git a/.github/JAR Source/TextureOps.java → .../java/com/yasirkula/unity/TextureOps.java b/.github/JAR Source/TextureOps.java → .../java/com/yasirkula/unity/TextureOps.java
diff --git a/.github/AAR Source (Android)/proguard.txt b/.github/AAR Source (Android)/proguard.txt
@@ -0,0 +1 @@
+-keep class com.yasirkula.unity.* { *; }
diff --git a/Plugins/TextureOps/Android/TextureOps.aar b/Plugins/TextureOps/Android/TextureOps.aar
diff --git a/...ns/TextureOps/Android/TextureOps.jar.meta → ...ns/TextureOps/Android/TextureOps.aar.meta b/...ns/TextureOps/Android/TextureOps.jar.meta → ...ns/TextureOps/Android/TextureOps.aar.meta
diff --git a/Plugins/TextureOps/Android/TextureOps.jar b/Plugins/TextureOps/Android/TextureOps.jar
diff --git a/Plugins/TextureOps/Editor/TOPostProcessBuild.cs b/Plugins/TextureOps/Editor/TOPostProcessBuild.cs
@@ -1,14 +1,26 @@
-#if UNITY_IOS
+using System.IO;
 using UnityEditor;
+using UnityEngine;
+#if UNITY_IOS
 using UnityEditor.Callbacks;
-using System.IO;
 using UnityEditor.iOS.Xcode;
 #endif
 
 public class TOPostProcessBuild
 {
 	private const bool ENABLED = true;
 
+	[InitializeOnLoadMethod]
+	public static void ValidatePlugin()
+	{
+		string jarPath = "Assets/Plugins/TextureOps/Android/TextureOps.jar";
+		if( File.Exists( jarPath ) )
+		{
+			Debug.Log( "Deleting obsolete " + jarPath );
+			AssetDatabase.DeleteAsset( jarPath );
+		}
+	}
+
 #if UNITY_IOS
 #pragma warning disable 0162
 	[PostProcessBuild]

diff --git a/Plugins/TextureOps/TextureOps.cs b/Plugins/TextureOps/TextureOps.cs
@@ -523,7 +523,7 @@ public static ImageProperties GetImageProperties( string imagePath )
 				mimeType = properties[2].Trim();
 				if( mimeType.Length == 0 )
 				{
-					String extension = Path.GetExtension( imagePath ).ToLowerInvariant();
+					string extension = Path.GetExtension( imagePath ).ToLowerInvariant();
 					if( extension == ".png" )
 						mimeType = "image/png";
 					else if( extension == ".jpg" || extension == ".jpeg" )

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.textureops",
   "displayName": "Texture Ops",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "documentationUrl": "https://github.com/yasirkula/UnityTextureOps",
   "changelogUrl": "https://github.com/yasirkula/UnityTextureOps/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityTextureOps/blob/master/LICENSE.txt",