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

…ssNotFoundExceptions automatically
yasirkula · Apr 12, 2021 · 2b7932e · 2b7932e
1 parent 514299a
commit 2b7932e
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 7 deletions.
diff --git a/...m/yasirkula/unity/RuntimePermissions.java → ...m/yasirkula/unity/RuntimePermissions.java b/...m/yasirkula/unity/RuntimePermissions.java → ...m/yasirkula/unity/RuntimePermissions.java
diff --git a/...ula/unity/RuntimePermissionsFragment.java → ...ula/unity/RuntimePermissionsFragment.java b/...ula/unity/RuntimePermissionsFragment.java → ...ula/unity/RuntimePermissionsFragment.java
diff --git a/...ula/unity/RuntimePermissionsReceiver.java → ...ula/unity/RuntimePermissionsReceiver.java b/...ula/unity/RuntimePermissionsReceiver.java → ...ula/unity/RuntimePermissionsReceiver.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/AndroidRuntimePermissions/Android/PermissionCallback.cs b/Plugins/AndroidRuntimePermissions/Android/PermissionCallback.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_ANDROID
+#if UNITY_EDITOR || UNITY_ANDROID
 using System.Threading;
 using UnityEngine;
 

diff --git a/Plugins/AndroidRuntimePermissions/Android/PermissionCallbackAsync.cs b/Plugins/AndroidRuntimePermissions/Android/PermissionCallbackAsync.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_ANDROID
+#if UNITY_EDITOR || UNITY_ANDROID
 using UnityEngine;
 
 namespace AndroidRuntimePermissionsNamespace

diff --git a/Plugins/AndroidRuntimePermissions/Android/PermissionCallbackHelper.cs b/Plugins/AndroidRuntimePermissions/Android/PermissionCallbackHelper.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_ANDROID
+#if UNITY_EDITOR || UNITY_ANDROID
 using UnityEngine;
 
 namespace AndroidRuntimePermissionsNamespace

diff --git a/Plugins/AndroidRuntimePermissions/Android/RuntimePermissions.aar b/Plugins/AndroidRuntimePermissions/Android/RuntimePermissions.aar
diff --git a/...sions/Android/RuntimePermissions.jar.meta → ...sions/Android/RuntimePermissions.aar.meta b/...sions/Android/RuntimePermissions.jar.meta → ...sions/Android/RuntimePermissions.aar.meta
diff --git a/Plugins/AndroidRuntimePermissions/Android/RuntimePermissions.jar b/Plugins/AndroidRuntimePermissions/Android/RuntimePermissions.jar
diff --git a/Plugins/AndroidRuntimePermissions/AndroidRuntimePermissions.cs b/Plugins/AndroidRuntimePermissions/AndroidRuntimePermissions.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Text;
 using UnityEngine;
-#if IS_ANDROID_PLATFORM
+#if UNITY_ANDROID
 using AndroidRuntimePermissionsNamespace;
 #endif
 

diff --git a/Plugins/AndroidRuntimePermissions/Editor.meta b/Plugins/AndroidRuntimePermissions/Editor.meta
diff --git a/Plugins/AndroidRuntimePermissions/Editor/ARPPostProcessBuild.cs b/Plugins/AndroidRuntimePermissions/Editor/ARPPostProcessBuild.cs
@@ -0,0 +1,22 @@
+#if UNITY_EDITOR
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace AndroidRuntimePermissionsNamespace
+{
+	public class ARPPostProcessBuild
+	{
+		[InitializeOnLoadMethod]
+		public static void ValidatePlugin()
+		{
+			string jarPath = "Assets/Plugins/AndroidRuntimePermissions/Android/RuntimePermissions.jar";
+			if( File.Exists( jarPath ) )
+			{
+				Debug.Log( "Deleting obsolete " + jarPath );
+				AssetDatabase.DeleteAsset( jarPath );
+			}
+		}
+	}
+}
+#endif
diff --git a/Plugins/AndroidRuntimePermissions/Editor/ARPPostProcessBuild.cs.meta b/Plugins/AndroidRuntimePermissions/Editor/ARPPostProcessBuild.cs.meta
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.androidruntimepermissions",
   "displayName": "Android Runtime Permissions",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "documentationUrl": "https://github.com/yasirkula/UnityAndroidRuntimePermissions",
   "changelogUrl": "https://github.com/yasirkula/UnityAndroidRuntimePermissions/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityAndroidRuntimePermissions/blob/master/LICENSE.txt",