Merge branch 'release/1.1.0-beta.1'

bitstadium · Apr 26, 2016 · 46fe2ca · 46fe2ca
2 parents 8f50969 + 7f12c92
commit 46fe2ca
Show file tree

Hide file tree

Showing 64 changed files with 840 additions and 373 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,14 @@ proguard/
 *.ipr
 *.iws
 .idea/
+gen-external-apklibs/
+out/
+target/
+.gradle/
+build/
+/*/build/
+*.log
+infer-out
 
 # =============== #
 # Unity generated #

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/Documentation/06_trouble_manifest_merge.png b/Documentation/06_trouble_manifest_merge.png
diff --git a/Documentation/07_portal_metrics.png b/Documentation/07_portal_metrics.png
diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
@@ -0,0 +1,25 @@
+###Changelog:###
+
+### 1.1.0-beta.1:
+
+* [NEW] User Metrics (user and session tracking)
+* [NEW] Authentication
+* [UPDATE] Plugin now uses HockeySDK Android 4.0.0-beta.1
+* [UPDATE] Minor bugfixes
+
+### 1.0.8:
+
+- Update SDK to use HockeySDK 3.6.2 for Android
+- Fix minor bug
+
+### 1.0.7:
+
+- Update SDK to use HockeySDK 3.6.1 for Android
+- Fix minor bug
+
+### 1.0.6:
+
+- Append SDK and App information to crash reports
+	* SDK name
+	* SDK version
+	* App version name
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml b/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.hockeyapp.unity"
-    android:versionCode="8"
-    android:versionName="1.0.8" >
+    android:versionCode="9"
+    android:versionName="1.1.0-beta.1" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
+        android:minSdkVersion="9"
+        android:targetSdkVersion="23" />
 
     <application
         android:allowBackup="true"
@@ -19,6 +19,7 @@
 
         <activity android:name="net.hockeyapp.android.UpdateActivity" />
         <activity android:name="net.hockeyapp.android.FeedbackActivity" />
+        <activity android:name="net.hockeyapp.android.PaintActivity" />
     </application>
 
 </manifest>