diff --git a/Documentation/01_add_plugin.png b/Documentation/01_add_plugin.png index ea62de2..a4eb2b1 100644 Binary files a/Documentation/01_add_plugin.png and b/Documentation/01_add_plugin.png differ diff --git a/Documentation/02_modify_manifest.png b/Documentation/02_modify_manifest.png index 32e1232..5c16244 100644 Binary files a/Documentation/02_modify_manifest.png and b/Documentation/02_modify_manifest.png differ diff --git a/Documentation/03_add_component.png b/Documentation/03_add_component.png index 5703921..782acf6 100644 Binary files a/Documentation/03_add_component.png and b/Documentation/03_add_component.png differ diff --git a/Documentation/04_config_script.png b/Documentation/04_config_script.png index 319053f..aeeddb6 100644 Binary files a/Documentation/04_config_script.png and b/Documentation/04_config_script.png differ diff --git a/Documentation/05_config_build_settings.png b/Documentation/05_config_build_settings.png index d03d696..2decdce 100644 Binary files a/Documentation/05_config_build_settings.png and b/Documentation/05_config_build_settings.png differ diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid.meta b/ExampleGame/Assets/HockeyAppUnityAndroid.meta new file mode 100644 index 0000000..2d95748 --- /dev/null +++ b/ExampleGame/Assets/HockeyAppUnityAndroid.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6bafd0e6dc07941d99c4eacbeed11a22 +folderAsset: yes +timeCreated: 1424113112 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugins/Android/AndroidManifest.xml b/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml similarity index 96% rename from Plugins/Android/AndroidManifest.xml rename to ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml index 4fe06e8..85347e9 100644 --- a/Plugins/Android/AndroidManifest.xml +++ b/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml @@ -2,8 +2,8 @@ logs){ WWWForm postForm = CreateForm(log); string lContent = postForm.headers["Content-Type"].ToString(); lContent = lContent.Replace("\"", ""); - Hashtable headers = new Hashtable(); + Dictionary headers = new Dictionary(); headers.Add("Content-Type", lContent); WWW www = new WWW(url, postForm.data, headers); yield return www; diff --git a/ExampleGame/Assets/Plugins/HockeyAppUnity-Scripts/HockeyAppAndroid.cs.meta b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs.meta similarity index 100% rename from ExampleGame/Assets/Plugins/HockeyAppUnity-Scripts/HockeyAppAndroid.cs.meta rename to ExampleGame/Assets/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs.meta diff --git a/ExampleGame/Assets/Plugins/Android/HockeySDK-3.0.2.jar b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-3.0.2.jar similarity index 100% rename from ExampleGame/Assets/Plugins/Android/HockeySDK-3.0.2.jar rename to ExampleGame/Assets/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 new file mode 100644 index 0000000..53c5df0 --- /dev/null +++ b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-3.0.2.jar.meta @@ -0,0 +1,53 @@ +fileFormatVersion: 2 +guid: ca9a94404a2ba4a929d9215c286d9a37 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARMv7 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: x86 + Linux64: + enabled: 0 + settings: + CPU: x86_64 + OSXIntel: + enabled: 0 + settings: + CPU: AnyCPU + OSXIntel64: + enabled: 0 + settings: + CPU: AnyCPU + Win: + enabled: 0 + settings: + CPU: AnyCPU + Win64: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ExampleGame/Assets/Plugins/Android/exampleunityplugin.jar b/ExampleGame/Assets/HockeyAppUnityAndroid/exampleunityplugin.jar similarity index 100% rename from ExampleGame/Assets/Plugins/Android/exampleunityplugin.jar rename to ExampleGame/Assets/HockeyAppUnityAndroid/exampleunityplugin.jar diff --git a/ExampleGame/Assets/Plugins/Android/exampleunityplugin.jar.meta b/ExampleGame/Assets/HockeyAppUnityAndroid/exampleunityplugin.jar.meta similarity index 100% rename from ExampleGame/Assets/Plugins/Android/exampleunityplugin.jar.meta rename to ExampleGame/Assets/HockeyAppUnityAndroid/exampleunityplugin.jar.meta diff --git a/ExampleGame/Assets/Plugins/Android/hockeyappunity.jar b/ExampleGame/Assets/HockeyAppUnityAndroid/hockeyappunity.jar similarity index 100% rename from ExampleGame/Assets/Plugins/Android/hockeyappunity.jar rename to ExampleGame/Assets/HockeyAppUnityAndroid/hockeyappunity.jar diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/hockeyappunity.jar.meta b/ExampleGame/Assets/HockeyAppUnityAndroid/hockeyappunity.jar.meta new file mode 100644 index 0000000..38d9e3d --- /dev/null +++ b/ExampleGame/Assets/HockeyAppUnityAndroid/hockeyappunity.jar.meta @@ -0,0 +1,53 @@ +fileFormatVersion: 2 +guid: 1eca6629a47c448d18a6b1f5a0922fa9 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARMv7 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: x86 + Linux64: + enabled: 0 + settings: + CPU: x86_64 + OSXIntel: + enabled: 0 + settings: + CPU: AnyCPU + OSXIntel64: + enabled: 0 + settings: + CPU: AnyCPU + Win: + enabled: 0 + settings: + CPU: AnyCPU + Win64: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ExampleGame/Assets/Plugins/Android.meta b/ExampleGame/Assets/Plugins/Android.meta deleted file mode 100644 index 3491c3e..0000000 --- a/ExampleGame/Assets/Plugins/Android.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 5dccd3028f9d1400a8a874b061892c92 -folderAsset: yes -DefaultImporter: - userData: diff --git a/ExampleGame/Assets/Plugins/Android/HockeySDK-3.0.2.jar.meta b/ExampleGame/Assets/Plugins/Android/HockeySDK-3.0.2.jar.meta deleted file mode 100644 index abd1d73..0000000 --- a/ExampleGame/Assets/Plugins/Android/HockeySDK-3.0.2.jar.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: ca9a94404a2ba4a929d9215c286d9a37 -DefaultImporter: - userData: diff --git a/ExampleGame/Assets/TestScene.unity b/ExampleGame/Assets/TestScene.unity index 9d894e0..b36ceda 100644 Binary files a/ExampleGame/Assets/TestScene.unity and b/ExampleGame/Assets/TestScene.unity differ diff --git a/ExampleGame/ProjectSettings/GraphicsSettings.asset b/ExampleGame/ProjectSettings/GraphicsSettings.asset index 91be959..cd5079d 100644 Binary files a/ExampleGame/ProjectSettings/GraphicsSettings.asset and b/ExampleGame/ProjectSettings/GraphicsSettings.asset differ diff --git a/ExampleGame/ProjectSettings/NavMeshAreas.asset b/ExampleGame/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000..a69113f Binary files /dev/null and b/ExampleGame/ProjectSettings/NavMeshAreas.asset differ diff --git a/ExampleGame/ProjectSettings/ProjectSettings.asset b/ExampleGame/ProjectSettings/ProjectSettings.asset index 70da63f..b1d157d 100644 Binary files a/ExampleGame/ProjectSettings/ProjectSettings.asset and b/ExampleGame/ProjectSettings/ProjectSettings.asset differ diff --git a/ExampleGame/ProjectSettings/ProjectVersion.txt b/ExampleGame/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000..e7c3e83 --- /dev/null +++ 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 new file mode 100644 index 0000000..b080d2d --- /dev/null +++ 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 index b28bedf..15fb2d7 100644 --- a/HockeyAppUnity/AndroidManifest.xml +++ b/HockeyAppUnity/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="5" + android:versionName="1.0.4" > diff --git a/ExampleGame/Assets/Plugins/Android/AndroidManifest.xml b/Plugins/HockeyAppUnityAndroid/AndroidManifest.xml similarity index 96% rename from ExampleGame/Assets/Plugins/Android/AndroidManifest.xml rename to Plugins/HockeyAppUnityAndroid/AndroidManifest.xml index 4fe06e8..85347e9 100644 --- a/ExampleGame/Assets/Plugins/Android/AndroidManifest.xml +++ b/Plugins/HockeyAppUnityAndroid/AndroidManifest.xml @@ -2,8 +2,8 @@ logs){ WWWForm postForm = CreateForm(log); string lContent = postForm.headers["Content-Type"].ToString(); lContent = lContent.Replace("\"", ""); - Hashtable headers = new Hashtable(); + Dictionary headers = new Dictionary(); 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 new file mode 100644 index 0000000..fc3a3cf --- /dev/null +++ b/Plugins/HockeyAppUnityAndroid/HockeyAppUnity-Scripts/HockeyAppAndroid.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6128f30ef6e64ee891f378a80eed1e3 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Plugins/Android/HockeySDK-3.0.2.jar b/Plugins/HockeyAppUnityAndroid/HockeySDK-3.0.2.jar similarity index 100% rename from Plugins/Android/HockeySDK-3.0.2.jar rename to Plugins/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 new file mode 100644 index 0000000..53c5df0 --- /dev/null +++ b/Plugins/HockeyAppUnityAndroid/HockeySDK-3.0.2.jar.meta @@ -0,0 +1,53 @@ +fileFormatVersion: 2 +guid: ca9a94404a2ba4a929d9215c286d9a37 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARMv7 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: x86 + Linux64: + enabled: 0 + settings: + CPU: x86_64 + OSXIntel: + enabled: 0 + settings: + CPU: AnyCPU + OSXIntel64: + enabled: 0 + settings: + CPU: AnyCPU + Win: + enabled: 0 + settings: + CPU: AnyCPU + Win64: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ExampleGame/Assets/Plugins/Android/hockeyappunity.jar.meta b/Plugins/HockeyAppUnityAndroid/exampleunityplugin.jar.meta similarity index 56% rename from ExampleGame/Assets/Plugins/Android/hockeyappunity.jar.meta rename to Plugins/HockeyAppUnityAndroid/exampleunityplugin.jar.meta index 948ce49..a30f1f7 100644 --- a/ExampleGame/Assets/Plugins/Android/hockeyappunity.jar.meta +++ b/Plugins/HockeyAppUnityAndroid/exampleunityplugin.jar.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: 1eca6629a47c448d18a6b1f5a0922fa9 +guid: 808e91785d8924c3c9a9fbf1de9c6329 DefaultImporter: userData: diff --git a/Plugins/Android/hockeyappunity.jar b/Plugins/HockeyAppUnityAndroid/hockeyappunity.jar similarity index 100% rename from Plugins/Android/hockeyappunity.jar rename to Plugins/HockeyAppUnityAndroid/hockeyappunity.jar diff --git a/Plugins/HockeyAppUnityAndroid/hockeyappunity.jar.meta b/Plugins/HockeyAppUnityAndroid/hockeyappunity.jar.meta new file mode 100644 index 0000000..38d9e3d --- /dev/null +++ b/Plugins/HockeyAppUnityAndroid/hockeyappunity.jar.meta @@ -0,0 +1,53 @@ +fileFormatVersion: 2 +guid: 1eca6629a47c448d18a6b1f5a0922fa9 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Android: + enabled: 1 + settings: + CPU: ARMv7 + Any: + enabled: 0 + settings: {} + Editor: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + Linux: + enabled: 0 + settings: + CPU: x86 + Linux64: + enabled: 0 + settings: + CPU: x86_64 + OSXIntel: + enabled: 0 + settings: + CPU: AnyCPU + OSXIntel64: + enabled: 0 + settings: + CPU: AnyCPU + Win: + enabled: 0 + settings: + CPU: AnyCPU + Win64: + enabled: 0 + settings: + CPU: AnyCPU + iOS: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/README.md b/README.md index dda84f0..d149c3d 100644 --- 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.