Skip to content

Commit

Permalink
Merge pull request #209 from BranchMetrics/crashlytics-conflict
Browse files Browse the repository at this point in the history
fix: Create path for Crashlytics harmony
  • Loading branch information
aaustin authored Sep 15, 2016
2 parents 775333e + 50bc721 commit ea6df31
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions build-branch-extras.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependencies {
compile ('io.branch.sdk.android:library:2.+')
}
3 changes: 2 additions & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ SOFTWARE.
</intent-filter>
</config-file>
<source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
<framework src="io.branch.sdk.android:library:1+" />
<!-- <framework src="io.branch.sdk.android:library:2+" /> -->
<framework src="build-branch-extras.gradle" custom="true" type="gradleReference" />
</platform>

<!-- ios -->
Expand Down

0 comments on commit ea6df31

Please sign in to comment.