Merge branch 'release/1.1.2'

bitstadium · Jan 16, 2017 · ed0eb36 · ed0eb36
2 parents bed9c70 + bb81920
commit ed0eb36
Show file tree

Hide file tree

Showing 20 changed files with 68 additions and 59 deletions.
diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
@@ -1,5 +1,11 @@
 ###Changelog:###
 
+### 1.1.2
+* [BUGFIX] Installing an app through HockeyApp would falsely report this as a store installation on Android Nougat
+* [BUGFIX] Workaround an issue when installing updates and targeting SDK version 24
+* [BUGFIX] Added user contributed localizations for Simplified Chinese and Russian
+* [UPDATE] Plugin now uses HockeySDK Android 4.1.2
+
 ### 1.1.1
 * [BUGFIX] Fix bug where report for managed exceptions didn't contain a `CrashReporter Key`. The key is needed to get proper user statistics on the portal
 * [UPDATE] Plugin now uses HockeySDK Android 4.0.1

diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml b/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.hockeyapp.unity"
-    android:versionCode="11"
-    android:versionName="1.1.1" >
-
-    <uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    android:versionCode="12"
+    android:versionName="1.1.2" >
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application>
+
+        <activity android:name=".UpdateActivity" />
+        <activity android:name=".FeedbackActivity" />
+        <activity android:name=".PaintActivity" />
+        <activity android:name=".LoginActivity" />
+        <activity android:name=".ExpiryInfoActivity" />
 
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-
-        <activity android:name="net.hockeyapp.android.UpdateActivity" />
-        <activity android:name="net.hockeyapp.android.FeedbackActivity" />
-        <activity android:name="net.hockeyapp.android.PaintActivity" />
     </application>
 
 </manifest>
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml.meta b/ExampleGame/Assets/HockeyAppUnityAndroid/AndroidManifest.xml.meta
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-4.0.1.aar b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-4.0.1.aar
diff --git a/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-4.1.2.aar b/ExampleGame/Assets/HockeyAppUnityAndroid/HockeySDK-4.1.2.aar
diff --git a/...ityAndroid/hockeysdk-unity-1.1.1.aar.meta → ...yAppUnityAndroid/HockeySDK-4.1.2.aar.meta b/...ityAndroid/hockeysdk-unity-1.1.1.aar.meta → ...yAppUnityAndroid/HockeySDK-4.1.2.aar.meta
diff --git a/...AppUnityAndroid/hockeysdk-unity-1.1.1.aar → ...AppUnityAndroid/hockeysdk-unity-1.1.2.aar b/...AppUnityAndroid/hockeysdk-unity-1.1.1.aar → ...AppUnityAndroid/hockeysdk-unity-1.1.2.aar
diff --git a/...yAppUnityAndroid/HockeySDK-4.0.1.aar.meta → ...ityAndroid/hockeysdk-unity-1.1.2.aar.meta b/...yAppUnityAndroid/HockeySDK-4.0.1.aar.meta → ...ityAndroid/hockeysdk-unity-1.1.2.aar.meta
diff --git a/ExampleGame/Assets/TestScene.unity b/ExampleGame/Assets/TestScene.unity
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,2 +1,2 @@
-m_EditorVersion: 5.3.4f1
+m_EditorVersion: 5.4.1f1
 m_StandardAssetsVersion: 0
diff --git a/HockeyAppUnityPlugin/hockeysdk-unity/build.gradle b/HockeyAppUnityPlugin/hockeysdk-unity/build.gradle
@@ -25,5 +25,5 @@ repositories {
 }
 
 dependencies {
-    compile(name:'HockeySDK-4.0.1', ext:'aar')
+    compile(name:'HockeySDK-4.1.2', ext:'aar')
 }
diff --git a/HockeyAppUnityPlugin/hockeysdk-unity/libs/HockeySDK-4.0.1.aar b/HockeyAppUnityPlugin/hockeysdk-unity/libs/HockeySDK-4.0.1.aar
diff --git a/HockeyAppUnityPlugin/hockeysdk-unity/libs/HockeySDK-4.1.2.aar b/HockeyAppUnityPlugin/hockeysdk-unity/libs/HockeySDK-4.1.2.aar
diff --git a/HockeyAppUnityPlugin/hockeysdk-unity/src/main/AndroidManifest.xml b/HockeyAppUnityPlugin/hockeysdk-unity/src/main/AndroidManifest.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.hockeyapp.unity"
-    android:versionCode="10"
-    android:versionName="1.1.0" >
-
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.hockeyapp.unity">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application>
 
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="23" />
+        <activity android:name=".UpdateActivity" />
+        <activity android:name=".FeedbackActivity" />
+        <activity android:name=".PaintActivity" />
+        <activity android:name=".LoginActivity" />
+        <activity android:name=".ExpiryInfoActivity" />
 
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-
-        <activity android:name="net.hockeyapp.android.UpdateActivity" />
-        <activity android:name="net.hockeyapp.android.FeedbackActivity" />
     </application>
 
 </manifest>
diff --git a/Plugins/HockeyAppUnityAndroid/AndroidManifest.xml b/Plugins/HockeyAppUnityAndroid/AndroidManifest.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.hockeyapp.unity"
-    android:versionCode="11"
-    android:versionName="1.1.1" >
-
-    <uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    android:versionCode="12"
+    android:versionName="1.1.2" >
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="23" />
+        android:targetSdkVersion="24" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application>
+
+        <activity android:name=".UpdateActivity" />
+        <activity android:name=".FeedbackActivity" />
+        <activity android:name=".PaintActivity" />
+        <activity android:name=".LoginActivity" />
+        <activity android:name=".ExpiryInfoActivity" />
 
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-
-        <activity android:name="net.hockeyapp.android.UpdateActivity" />
-        <activity android:name="net.hockeyapp.android.FeedbackActivity" />
-        <activity android:name="net.hockeyapp.android.PaintActivity" />
     </application>
 
 </manifest>
diff --git a/Plugins/HockeyAppUnityAndroid/HockeySDK-4.0.1.aar b/Plugins/HockeyAppUnityAndroid/HockeySDK-4.0.1.aar
diff --git a/Plugins/HockeyAppUnityAndroid/HockeySDK-4.1.2.aar b/Plugins/HockeyAppUnityAndroid/HockeySDK-4.1.2.aar
diff --git a/...AppUnityAndroid/hockeysdk-unity-1.1.1.aar → ...AppUnityAndroid/hockeysdk-unity-1.1.2.aar b/...AppUnityAndroid/hockeysdk-unity-1.1.1.aar → ...AppUnityAndroid/hockeysdk-unity-1.1.2.aar
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Version 1.1.1
+## Version 1.1.2
 =======
 
 ## Introduction
@@ -21,15 +21,15 @@ The following features are currently supported:
 
 This document contains the following sections:
 
-1. [Requirements (Version 1.1.1)](#1)
+1. [Requirements (Version 1.1.2)](#1)
 2. [Installation & Setup](#2)
 3. [Examples](#3)
 4. [Troubleshooting](#4)
 5. [Code of Conduct](#5)
 6. [Contributor License](#6)
 7. [Licenses](#7)
 
-## <a name="1"></a>Requirements (Version 1.1.1)
+## <a name="1"></a>Requirements (Version 1.1.2)
 
 * [Changelog](Documentation/Changelog.md)
 * 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 1.0.3 tag on GitHub).