Merge pull request #26 from MatkovIvan/update-5.0.4

Use device identifier as crash reporter key
bitstadium · Nov 22, 2017 · a13f7a8 · a13f7a8
2 parents 58ae93d + f782e97
commit a13f7a8
Show file tree

Hide file tree

Showing 35 changed files with 294 additions and 248 deletions.
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml b/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.hockeyapp.unity"
-    android:versionCode="17"
-    android:versionName="5.0.0" >
+    android:versionCode="18"
+    android:versionName="5.0.1" >
 
     <uses-sdk
         android:minSdkVersion="15"

diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs
@@ -1,5 +1,5 @@
 /*
- * Version: 5.0.0
+ * Version: 5.0.1
  */
 
 using UnityEngine;
@@ -263,6 +263,22 @@ protected String GetModel ()
 		return model;
 	}
 
+    /// <summary>
+    /// The unique identifier for device, not dependent on package or device.
+    /// </summary>
+    /// <returns>The unique identifier for device, not dependent on package or device.</returns>
+    protected String GetDeviceIdentifier ()
+    {
+        string deviceIdentifier = null;
+
+        #if (UNITY_ANDROID && !UNITY_EDITOR)
+        AndroidJavaClass jc = new AndroidJavaClass("net.hockeyapp.unity.HockeyUnityPlugin");
+        deviceIdentifier = jc.CallStatic<string>("getDeviceIdentifier");
+        #endif
+
+        return deviceIdentifier;
+    }
+
 	/// <summary>
 	/// Collect all header fields for the custom exception report.
 	/// </summary>
@@ -271,7 +287,7 @@ protected virtual List<string> GetLogHeaders ()
 	{
 		List<string> list = new List<string> ();
 
-		#if (UNITY_ANDROID && !UNITY_EDITOR)
+#if (UNITY_ANDROID && !UNITY_EDITOR)
 
 		list.Add("Package: " + packageID);
 
@@ -291,10 +307,13 @@ protected virtual List<string> GetLogHeaders ()
 		string model = GetModel();
 		list.Add("Model: " + model);
 
+		string deviceIdentifier = GetDeviceIdentifier();
+		list.Add("CrashReporter Key: " + deviceIdentifier);
+
 		list.Add("Date: " + DateTime.UtcNow.ToString("ddd MMM dd HH:mm:ss {}zzzz yyyy").Replace("{}", "GMT"));
-		#endif
+#endif
 
-		return list;
+        return list;
 	}
 
 	/// <summary>

diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-5.0.2.aar b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-5.0.2.aar
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-5.0.4.aar b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-5.0.4.aar
diff --git a/...yAppUnityAndroid/HockeySDK-5.0.2.aar.meta → ...yAppUnityAndroid/HockeySDK-5.0.4.aar.meta b/...yAppUnityAndroid/HockeySDK-5.0.2.aar.meta → ...yAppUnityAndroid/HockeySDK-5.0.4.aar.meta
diff --git a/...AppUnityAndroid/hockeysdk-unity-5.0.0.aar → ...AppUnityAndroid/hockeysdk-unity-5.0.1.aar b/...AppUnityAndroid/hockeysdk-unity-5.0.0.aar → ...AppUnityAndroid/hockeysdk-unity-5.0.1.aar
diff --git a/...ityAndroid/hockeysdk-unity-5.0.0.aar.meta → ...ityAndroid/hockeysdk-unity-5.0.1.aar.meta b/...ityAndroid/hockeysdk-unity-5.0.0.aar.meta → ...ityAndroid/hockeysdk-unity-5.0.1.aar.meta
diff --git a/ExampleGame/Assets/TestScene.unity b/ExampleGame/Assets/TestScene.unity
diff --git a/ExampleGame/ProjectSettings/AudioManager.asset b/ExampleGame/ProjectSettings/AudioManager.asset
diff --git a/ExampleGame/ProjectSettings/ClusterInputManager.asset b/ExampleGame/ProjectSettings/ClusterInputManager.asset
diff --git a/ExampleGame/ProjectSettings/DynamicsManager.asset b/ExampleGame/ProjectSettings/DynamicsManager.asset
diff --git a/ExampleGame/ProjectSettings/EditorBuildSettings.asset b/ExampleGame/ProjectSettings/EditorBuildSettings.asset
diff --git a/ExampleGame/ProjectSettings/EditorSettings.asset b/ExampleGame/ProjectSettings/EditorSettings.asset
diff --git a/ExampleGame/ProjectSettings/GraphicsSettings.asset b/ExampleGame/ProjectSettings/GraphicsSettings.asset
diff --git a/ExampleGame/ProjectSettings/InputManager.asset b/ExampleGame/ProjectSettings/InputManager.asset
diff --git a/ExampleGame/ProjectSettings/NavMeshAreas.asset b/ExampleGame/ProjectSettings/NavMeshAreas.asset
diff --git a/ExampleGame/ProjectSettings/NetworkManager.asset b/ExampleGame/ProjectSettings/NetworkManager.asset
diff --git a/ExampleGame/ProjectSettings/Physics2DSettings.asset b/ExampleGame/ProjectSettings/Physics2DSettings.asset
diff --git a/ExampleGame/ProjectSettings/ProjectSettings.asset b/ExampleGame/ProjectSettings/ProjectSettings.asset
diff --git a/ExampleGame/ProjectSettings/ProjectVersion.txt b/ExampleGame/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 5.6.3f1
+m_EditorVersion: 2017.1.0f3
diff --git a/ExampleGame/ProjectSettings/QualitySettings.asset b/ExampleGame/ProjectSettings/QualitySettings.asset
diff --git a/ExampleGame/ProjectSettings/TagManager.asset b/ExampleGame/ProjectSettings/TagManager.asset
diff --git a/ExampleGame/ProjectSettings/TimeManager.asset b/ExampleGame/ProjectSettings/TimeManager.asset
diff --git a/ExampleGame/ProjectSettings/UnityConnectSettings.asset b/ExampleGame/ProjectSettings/UnityConnectSettings.asset
diff --git a/HockeyAppUnityPlugin/build.gradle b/HockeyAppUnityPlugin/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 

diff --git a/HockeyAppUnityPlugin/gradle/wrapper/gradle-wrapper.properties b/HockeyAppUnityPlugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 19 18:17:12 PDT 2017
+#Wed Nov 22 12:44:27 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/HockeyAppUnityPlugin/hockeysdk-unity/build.gradle b/HockeyAppUnityPlugin/hockeysdk-unity/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.1"
 
     defaultConfig {
         minSdkVersion 15
@@ -25,5 +24,5 @@ repositories {
 }
 
 dependencies {
-    compile(name:'HockeySDK-5.0.2', ext:'aar')
+    compile(name:'HockeySDK-5.0.4', ext:'aar')
 }
diff --git a/HockeyAppUnityPlugin/hockeysdk-unity/libs/HockeySDK-5.0.2.aar b/HockeyAppUnityPlugin/hockeysdk-unity/libs/HockeySDK-5.0.2.aar
diff --git a/HockeyAppUnityPlugin/hockeysdk-unity/libs/HockeySDK-5.0.4.aar b/HockeyAppUnityPlugin/hockeysdk-unity/libs/HockeySDK-5.0.4.aar
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 5.6.3f1
		m_EditorVersion: 2017.1.0f3