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

…ssNotFoundExceptions automatically
yasirkula · Apr 12, 2021 · 68d2b2a · 68d2b2a
1 parent b502dd0
commit 68d2b2a
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 21 deletions.
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/.github/README.md b/.github/README.md
@@ -41,7 +41,7 @@ After building your project, verify that NativeCamera's `<provider ... />` tag i
 
 - **Can't use the camera, it says "java.lang.ClassNotFoundException: com.yasirkula.unity.NativeCamera" in Logcat**
 
-If your project uses ProGuard, try adding the following line to ProGuard filters: `-keep class com.yasirkula.unity.* { *; }`
+If you are sure that your plugin is up-to-date, then enable **Custom Proguard File** option from *Player Settings* and add the following line to that file: `-keep class com.yasirkula.unity.* { *; }`
 
 - **NativeCamera functions return Permission.Denied even though I've granted the permission"**
 

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

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

diff --git a/Plugins/NativeCamera/Android/NCPermissionCallbackAndroid.cs b/Plugins/NativeCamera/Android/NCPermissionCallbackAndroid.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_ANDROID
+#if UNITY_EDITOR || UNITY_ANDROID
 using System.Threading;
 using UnityEngine;
 

diff --git a/Plugins/NativeCamera/Android/NativeCamera.aar b/Plugins/NativeCamera/Android/NativeCamera.aar
diff --git a/Plugins/NativeCamera/Editor/NCPostProcessBuild.cs b/Plugins/NativeCamera/Editor/NCPostProcessBuild.cs
@@ -1,7 +1,7 @@
-using System.IO;
+#if UNITY_IOS
+using System.IO;
 using UnityEditor;
 using UnityEngine;
-#if UNITY_IOS
 using UnityEditor.Callbacks;
 using UnityEditor.iOS.Xcode;
 #endif
@@ -15,17 +15,6 @@ public class NCPostProcessBuild
 		private const string CAMERA_USAGE_DESCRIPTION = "The app requires access to the camera to take pictures or record videos with it.";
 		private const string MICROPHONE_USAGE_DESCRIPTION = "The app will capture microphone input in the recorded video.";
 
-		[InitializeOnLoadMethod]
-		public static void ValidatePlugin()
-		{
-			string jarPath = "Assets/Plugins/NativeCamera/Android/NativeCamera.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/NativeCamera/NativeCamera.cs b/Plugins/NativeCamera/NativeCamera.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using UnityEngine;
 using Object = UnityEngine.Object;
-#if !UNITY_EDITOR && ( UNITY_ANDROID || UNITY_IOS )
+#if UNITY_ANDROID || UNITY_IOS
 using NativeCameraNamespace;
 #endif
 

diff --git a/Plugins/NativeCamera/README.txt b/Plugins/NativeCamera/README.txt
@@ -28,7 +28,7 @@ There are two ways to set up the plugin on iOS:
 After building your project, verify that NativeCamera's "<provider ... />" tag is inserted in-between the "<application>...</application>" tags of PROJECT_PATH/Temp/StagingArea/AndroidManifest.xml. If not, please contact me.
 
 - Can't use the camera, it says "java.lang.ClassNotFoundException: com.yasirkula.unity.NativeCamera" in Logcat
-If your project uses ProGuard, try adding the following line to ProGuard filters: -keep class com.yasirkula.unity.* { *; }
+If you are sure that your plugin is up-to-date, then enable "Custom Proguard File" option from Player Settings and add the following line to that file: -keep class com.yasirkula.unity.* { *; }
 
 4. SCRIPTING API
 Please see the online documentation for a more in-depth documentation of the Scripting API: https://github.com/yasirkula/UnityNativeCamera

diff --git a/Plugins/NativeCamera/iOS/NCCameraCallbackiOS.cs b/Plugins/NativeCamera/iOS/NCCameraCallbackiOS.cs
@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_IOS
+#if UNITY_EDITOR || UNITY_IOS
 using UnityEngine;
 
 namespace NativeCameraNamespace

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.yasirkula.nativecamera",
   "displayName": "Native Camera",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "documentationUrl": "https://github.com/yasirkula/UnityNativeCamera",
   "changelogUrl": "https://github.com/yasirkula/UnityNativeCamera/releases",
   "licensesUrl": "https://github.com/yasirkula/UnityNativeCamera/blob/master/LICENSE.txt",