Merge pull request #180 from antonargunov/master

version 0.6.4

Author: antonargunov

BranchUnityTestBed/Assets/Branch/Branch.cs

@@ -7,7 +7,7 @@
 
 public class Branch : MonoBehaviour {
 
-	public static string sdkVersion = "0.6.3";
+	public static string sdkVersion = "0.6.4";
 
     public delegate void BranchCallbackWithParams(Dictionary<string, object> parameters, string error);
     public delegate void BranchCallbackWithUrl(string url, string error);

BranchUnityTestBed/Assets/Branch/Editor/BranchDependencies.xml

@@ -0,0 +1,9 @@
+<dependencies>
+  <androidPackages>
+    <androidPackage spec="com.google.android.gms:play-services-ads:16.0.0">
+      <repositories>
+        <repository>https://maven.google.com/</repository>
+      </repositories>
+    </androidPackage>
+  </androidPackages>
+</dependencies>

BranchUnityTestBed/Assets/Branch/Editor/BranchDependencies.xml.meta

@@ -0,0 +1,8 @@
+Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.136.0.dll
+Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.136.0.dll.mdb
+Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.136.0.dll
+Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.136.0.dll.mdb
+Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.mdb
+Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.136.0.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.136.0.dll.mdb

BranchUnityTestBed/Assets/PlayServicesResolver.meta

@@ -0,0 +1,56 @@
+<dependencies>
+  <packages>
+    <package>com.google.android.gms:play-services-ads:16.0.0</package>
+  </packages>
+  <files>
+    <file>Assets/Plugins/Android/androidx.annotation.annotation-1.0.0.jar</file>
+    <file>Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar</file>
+    <file>Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.browser.browser-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar</file>
+    <file>Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.core.core-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.legacy.legacy-support-v4-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar</file>
+    <file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.media.media-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.print.print-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-16.0.0.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-16.0.0.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-16.0.0.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-16.0.0.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-basement-16.0.1.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-gass-16.0.0.aar</file>
+  </files>
+  <settings>
+    <setting name="androidAbis" value="armeabi-v7a" />
+    <setting name="bundleId" value="com.zoom2games.test" />
+    <setting name="explodeAars" value="True" />
+    <setting name="gradleBuildEnabled" value="True" />
+    <setting name="gradleTemplateEnabled" value="False" />
+    <setting name="installAndroidPackages" value="False" />
+    <setting name="packageDir" value="Assets/Plugins/Android" />
+    <setting name="patchAndroidManifest" value="False" />
+    <setting name="patchMainTemplateGradle" value="False" />
+    <setting name="projectExportEnabled" value="False" />
+    <setting name="useJetifier" value="True" />
+  </settings>
+</dependencies>

BranchUnityTestBed/Assets/PlayServicesResolver/Editor.meta

@@ -0,0 +1,11 @@
+<projectSettings>
+  <projectSetting name="com.google.unity.oss.play_services_resolverAnalyticsCookie" value="116598dd7d804b168bdae735c457b3b5" />
+  <projectSetting name="com.google.unity.oss.play_services_resolverAnalyticsEnabled" value="True" />
+  <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="True" />
+  <projectSetting name="Google.VersionHandler.CleanUpPromptEnabled" value="True" />
+  <projectSetting name="Google.VersionHandler.RenameToCanonicalFilenames" value="False" />
+  <projectSetting name="Google.VersionHandler.RenameToDisableFilesEnabled" value="True" />
+  <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="Google.VersionHandler.VersionHandlingEnabled" value="True" />
+  <projectSetting name="GooglePlayServices.UseJetifier" value="True" />
+</projectSettings>

BranchUnityTestBed/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.136.0.dll

@@ -1,4 +1,7 @@
 Branch Unity SDK change log
+- 0.6.4
+  * Adding 'play-services-ads:16.0.0' dependencies
+  * Adding PlayServicesResolver plugin
 
 - 0.6.3
   * Fixing wrong Unity target for Unity 2019.x

BranchUnityTestBed/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.136.0.dll.mdb

@@ -48,7 +48,19 @@ Download code from here: [S3 Package](https://s3-us-west-1.amazonaws.com/branchh
 
 After acquiring the `BranchUnityWrapper.unityPackage` through one of these choices, you can import it into your project by clicking `Assets -> Import Package`.
 
-### Register you app
+#### Android dependencies
+We use google play services for tracking android device info.
+Use 'PlayServicesResolver' to add all needs libraries to your project.
+If you already have 'PlayServicesResolver', you can don't import this plugin from our package.
+
+After importing of our package:
+
+- go to "Assets->Play Services Resolver->Android Resolver"
+- tap "Resolve" or "Force Resolve"
+
+
+
+#### Register you app
 
 You can sign up for your own app id at [https://dashboard.branch.io](https://dashboard.branch.io)