Merge branch 'feature/unity5-support' into develop

bitstadium · Feb 16, 2015 · bfad1d5 · bfad1d5
2 parents 3a60507 + 0a4e3cf
commit bfad1d5
Show file tree

Hide file tree

Showing 37 changed files with 261 additions and 31 deletions.
diff --git a/Documentation/01_add_plugin.png b/Documentation/01_add_plugin.png
diff --git a/Documentation/02_modify_manifest.png b/Documentation/02_modify_manifest.png
diff --git a/Documentation/03_add_component.png b/Documentation/03_add_component.png
diff --git a/Documentation/04_config_script.png b/Documentation/04_config_script.png
diff --git a/Documentation/05_config_build_settings.png b/Documentation/05_config_build_settings.png
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid.meta b/ExampleGame/Assets/HockeyAppUnityAndroid.meta
diff --git a/Plugins/Android/AndroidManifest.xml → ...HockeyAppUnityAndroid/AndroidManifest.xml b/Plugins/Android/AndroidManifest.xml → ...HockeyAppUnityAndroid/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="net.hockeyapp.ExampleGameAndroid"
- android:versionName="1.0.3"
- android:versionCode="4"
+ android:versionName="1.0.4"
+ android:versionCode="5"
  android:installLocation="preferExternal">
   <supports-screens
   android:smallScreens="true"

diff --git a/.../Plugins/Android/AndroidManifest.xml.meta → ...yAppUnityAndroid/AndroidManifest.xml.meta b/.../Plugins/Android/AndroidManifest.xml.meta → ...yAppUnityAndroid/AndroidManifest.xml.meta
diff --git a/...ssets/Plugins/HockeyAppUnity-Scripts.meta → ...pUnityAndroid/HockeyAppUnity-Scripts.meta b/...ssets/Plugins/HockeyAppUnity-Scripts.meta → ...pUnityAndroid/HockeyAppUnity-Scripts.meta
diff --git a/...ockeyAppUnity-Scripts/HockeyAppAndroid.cs → ...ockeyAppUnity-Scripts/HockeyAppAndroid.cs b/...ockeyAppUnity-Scripts/HockeyAppAndroid.cs → ...ockeyAppUnity-Scripts/HockeyAppAndroid.cs
@@ -2,9 +2,9 @@
  *
  * Author: Christoph Wendt
  * 
- * Version: 1.0.3
+ * Version: 1.0.4
  *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
+ * Copyright (c) 2013-2015 HockeyApp, Bit Stadium GmbH.
  * All rights reserved.
  * 
  * Permission is hereby granted, free of charge, to any person
@@ -277,7 +277,7 @@ protected virtual IEnumerator SendLogs(List<string> logs){
 			WWWForm postForm = CreateForm(log);
 			string lContent = postForm.headers["Content-Type"].ToString();
 			lContent = lContent.Replace("\"", "");
-			Hashtable headers = new Hashtable();
+			Dictionary<string,string> headers = new Dictionary<string,string>();
 			headers.Add("Content-Type", lContent);
 			WWW www = new WWW(url, postForm.data, headers);
 			yield return www;

diff --git a/...AppUnity-Scripts/HockeyAppAndroid.cs.meta → ...AppUnity-Scripts/HockeyAppAndroid.cs.meta b/...AppUnity-Scripts/HockeyAppAndroid.cs.meta → ...AppUnity-Scripts/HockeyAppAndroid.cs.meta
diff --git a/...ssets/Plugins/Android/HockeySDK-3.0.2.jar → ...HockeyAppUnityAndroid/HockeySDK-3.0.2.jar b/...ssets/Plugins/Android/HockeySDK-3.0.2.jar → ...HockeyAppUnityAndroid/HockeySDK-3.0.2.jar
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-3.0.2.jar.meta b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-3.0.2.jar.meta
diff --git a/...ts/Plugins/Android/exampleunityplugin.jar → ...keyAppUnityAndroid/exampleunityplugin.jar b/...ts/Plugins/Android/exampleunityplugin.jar → ...keyAppUnityAndroid/exampleunityplugin.jar
diff --git a/...ugins/Android/exampleunityplugin.jar.meta → ...pUnityAndroid/exampleunityplugin.jar.meta b/...ugins/Android/exampleunityplugin.jar.meta → ...pUnityAndroid/exampleunityplugin.jar.meta
diff --git a/...Assets/Plugins/Android/hockeyappunity.jar → .../HockeyAppUnityAndroid/hockeyappunity.jar b/...Assets/Plugins/Android/hockeyappunity.jar → .../HockeyAppUnityAndroid/hockeyappunity.jar
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/hockeyappunity.jar.meta b/ExampleGame/Assets/HockeyAppUnityAndroid/hockeyappunity.jar.meta
diff --git a/ExampleGame/Assets/Plugins/Android.meta b/ExampleGame/Assets/Plugins/Android.meta
diff --git a/ExampleGame/Assets/Plugins/Android/HockeySDK-3.0.2.jar.meta b/ExampleGame/Assets/Plugins/Android/HockeySDK-3.0.2.jar.meta
diff --git a/ExampleGame/Assets/TestScene.unity b/ExampleGame/Assets/TestScene.unity
diff --git a/ExampleGame/ProjectSettings/GraphicsSettings.asset b/ExampleGame/ProjectSettings/GraphicsSettings.asset
diff --git a/ExampleGame/ProjectSettings/NavMeshAreas.asset b/ExampleGame/ProjectSettings/NavMeshAreas.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
@@ -0,0 +1,2 @@
+m_EditorVersion: 5.0.0f1
+m_StandardAssetsVersion: 0
diff --git a/HockeyAppUnity/.settings/org.eclipse.jdt.core.prefs b/HockeyAppUnity/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/HockeyAppUnity/AndroidManifest.xml b/HockeyAppUnity/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="4"
-    android:versionName="1.0.3" >
+    android:versionCode="5"
+    android:versionName="1.0.4" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/...ssets/Plugins/Android/AndroidManifest.xml → ...HockeyAppUnityAndroid/AndroidManifest.xml b/...ssets/Plugins/Android/AndroidManifest.xml → ...HockeyAppUnityAndroid/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="net.hockeyapp.ExampleGameAndroid"
- android:versionName="1.0.3"
- android:versionCode="4"
+ android:versionName="1.0.4"
+ android:versionCode="5"
  android:installLocation="preferExternal">
   <supports-screens
   android:smallScreens="true"

diff --git a/Plugins/HockeyAppUnityAndroid/AndroidManifest.xml.meta b/Plugins/HockeyAppUnityAndroid/AndroidManifest.xml.meta
diff --git a/ExampleGame/Assets/Plugins.meta → ...pUnityAndroid/HockeyAppUnity-Scripts.meta b/ExampleGame/Assets/Plugins.meta → ...pUnityAndroid/HockeyAppUnity-Scripts.meta
diff --git a/...ockeyAppUnity-Scripts/HockeyAppAndroid.cs → ...ockeyAppUnity-Scripts/HockeyAppAndroid.cs b/...ockeyAppUnity-Scripts/HockeyAppAndroid.cs → ...ockeyAppUnity-Scripts/HockeyAppAndroid.cs
@@ -2,9 +2,9 @@
  *
  * Author: Christoph Wendt
  * 
- * Version: 1.0.3
+ * Version: 1.0.4
  *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
+ * Copyright (c) 2013-2015 HockeyApp, Bit Stadium GmbH.
  * All rights reserved.
  * 
  * Permission is hereby granted, free of charge, to any person
@@ -277,7 +277,7 @@ protected virtual IEnumerator SendLogs(List<string> logs){
 			WWWForm postForm = CreateForm(log);
 			string lContent = postForm.headers["Content-Type"].ToString();
 			lContent = lContent.Replace("\"", "");
-			Hashtable headers = new Hashtable();
+			Dictionary<string,string> headers = new Dictionary<string,string>();
 			headers.Add("Content-Type", lContent);
 			WWW www = new WWW(url, postForm.data, headers);
 			yield return www;

diff --git a/Plugins/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs.meta b/Plugins/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs.meta
diff --git a/Plugins/Android/HockeySDK-3.0.2.jar → ...HockeyAppUnityAndroid/HockeySDK-3.0.2.jar b/Plugins/Android/HockeySDK-3.0.2.jar → ...HockeyAppUnityAndroid/HockeySDK-3.0.2.jar
diff --git a/Plugins/HockeyAppUnityAndroid/HockeySDK-3.0.2.jar.meta b/Plugins/HockeyAppUnityAndroid/HockeySDK-3.0.2.jar.meta
diff --git a/...s/Plugins/Android/hockeyappunity.jar.meta → ...pUnityAndroid/exampleunityplugin.jar.meta b/...s/Plugins/Android/hockeyappunity.jar.meta → ...pUnityAndroid/exampleunityplugin.jar.meta
diff --git a/Plugins/Android/hockeyappunity.jar → .../HockeyAppUnityAndroid/hockeyappunity.jar b/Plugins/Android/hockeyappunity.jar → .../HockeyAppUnityAndroid/hockeyappunity.jar
diff --git a/Plugins/HockeyAppUnityAndroid/hockeyappunity.jar.meta b/Plugins/HockeyAppUnityAndroid/hockeyappunity.jar.meta
diff --git a/README.md b/README.md
@@ -2,24 +2,24 @@
 
 The HockeyAppUnity-Android plugin implements support for using HockeyApp in your Unity-Android builds. It easily lets you keep track of crashes that have been caused by your scripts or native Java code.
 
-## Requirements (Version 1.0.3)
+## Requirements (Version 1.0.4)
 
-* Unity 4.2 or newer (older versions might work, but we haven't tested them).
-* Android 2.1or newer.
+* Unity 5.0 or newer (SDK versions with Unity 4 support can be found at the [Unity Asset Store](https://www.assetstore.unity3d.com/en/?gclid=CO) or by switching to the appropriate release branch on GitHub).
+* Android 2.1 or newer.
 
 ## Installation & Setup
 
 The following steps illustrate how to integrate the HockeyAppUnity-Android plugin:
 
 ### 1) Import plugin
-Copy the **Plugins** folder into the **Assets** directory of your Unity project
+Copy the **HockeyAppUnityAndroid** folder into the **Assets** directory of your Unity project
 Unity
-![alt text](Documentation/01_add_plugin.png  "Add plugins folders")
+![alt text](Documentation/01_add_plugin.png  "Add HockeyAppUnityAndroid folders")
 
 ### 2) Modify AndroidManifest.xml
-Change the value for **package** inside the AndroidManifest.xml (*Assets/Plugins/Android*) to the package identifier of your project.
+Change the value for **package** inside the AndroidManifest.xml (*Assets/HockeyAppUnityAndroid*) to the package identifier of your project.
 
-![alt text](Documentation/02_modify_manifest.png  "Add plugins folders")
+![alt text](Documentation/02_modify_manifest.png  "Modify manifest")
 
 ### 3) Create plugin-GameObject
 Create an empty game object (*GameObject -> Create Empty*) and add the **HockeyAppAndroid.cs** as one of its components.
@@ -37,7 +37,7 @@ The **Auto Upload** option defines if the crash reporting feature should send cr
 ### 4) Configure build settings
 You are now ready to build the project: Select **File -> Build Settings...** and switch to **Android** in the platform section. Check **Development Build** (see Build Settings section). 
 
-![alt text](Documentation/05_config_build_settings.png  "Add plugins folders")
+![alt text](Documentation/05_config_build_settings.png  "Configure build settings")
 
 That's it: Build your app / Android project as usual.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		m_EditorVersion: 5.0.0f1
		m_StandardAssetsVersion: 0