Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit e6e5864

Browse files
Conflict with nativescript-barcodescanner #615
1 parent 8fc770f commit e6e5864

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.firebasedemo",
44
"tns-ios": {
5-
"version": "3.4.0"
5+
"version": "3.4.1"
66
},
77
"tns-android": {
8-
"version": "3.4.0"
8+
"version": "3.4.1"
99
}
1010
},
1111
"dependencies": {

publish/scripts/installer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ dependencies {
335335
` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:$firebaseVersion"
336336
337337
// Uncomment if you need Facebook Authentication
338-
` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile "com.facebook.android:facebook-android-sdk:4.+"
338+
` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile ("com.facebook.android:facebook-login:4.+"){ exclude group: 'com.google.zxing' }
339339
340340
// Uncomment if you need Google Sign-In Authentication
341341
` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:$googlePlayServicesVersion"

src/platforms/android/include.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies {
5959
// compile "com.google.firebase:firebase-ads:$firebaseVersion"
6060

6161
// Uncomment if you need Facebook Authentication
62-
// compile "com.facebook.android:facebook-android-sdk:4.+"
62+
// compile ("com.facebook.android:facebook-login:4.+"){ exclude group: 'com.google.zxing' }
6363

6464
// Uncomment if you need Google Sign-In Authentication
6565
// compile "com.google.android.gms:play-services-auth:$googlePlayServicesVersion"

src/scripts/postinstall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3133,7 +3133,7 @@ dependencies {
31333133
` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:$firebaseVersion"
31343134
31353135
// Uncomment if you need Facebook Authentication
3136-
` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile "com.facebook.android:facebook-android-sdk:4.+"
3136+
` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile ("com.facebook.android:facebook-login:4.+"){ exclude group: 'com.google.zxing' }
31373137
31383138
// Uncomment if you need Google Sign-In Authentication
31393139
` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:$googlePlayServicesVersion"

0 commit comments

Comments
 (0)