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

Commit c186f51

Browse files
committed
Merge master branch
2 parents 11be190 + 40da077 commit c186f51

210 files changed

Lines changed: 28249 additions & 2929 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ src/**/*.d.ts
1010
src/platforms/ios_lib/TNSMLKitCamera/TNSMLKitCamera.xcodeproj/project.xcworkspace
1111
src/platforms/ios_lib/TNSMLKitCamera/TNSMLKitCamera.xcodeproj/xcuserdata
1212
src/platforms/ios/Podfile
13-
src/platforms/ios/build.xcconfig
1413
src/platforms/android/include.gradle
14+
src/platforms/android/mlkithelpersrc/**/*.class
1515
!src/firebase.d.ts
1616
!src/index.d.ts
1717
!src/references.d.ts
@@ -34,6 +34,7 @@ demo/firebasefunctions/functions/lib
3434
!demo-push/karma.conf.js
3535
demo-push/*.d.ts
3636
demo-ng/*.d.ts
37+
!demo-vue/app/main.js
3738
!demo/references.d.ts
3839
!demo-push/references.d.ts
3940
!demo-ng/references.d.ts

.travis.yml

Lines changed: 35 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,6 @@
1-
android:
2-
components:
3-
- tools
4-
- platform-tools
5-
- build-tools-27.0.3
6-
- build-tools-28.0.3
7-
- android-23
8-
- android-26
9-
- android-28
10-
- extra-android-m2repository
11-
12-
before_cache:
13-
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
14-
15-
cache:
16-
directories:
17-
- .nvm
18-
- $HOME/.gradle/caches/
19-
- $HOME/.gradle/wrapper/
20-
21-
install:
22-
- echo no | npm install -g nativescript
23-
- tns usage-reporting disable
24-
- tns error-reporting disable
25-
- cd src
26-
- npm i --ignore-scripts
27-
- npm run tsc
28-
- npm run package
29-
- cd ../demo
30-
- npm i
31-
32-
script:
33-
1+
branches:
2+
only:
3+
- master
344

355
matrix:
366
include:
@@ -40,38 +10,27 @@ matrix:
4010
node_js: "8"
4111
script: "npm run ci.tslint"
4212
- stage: "WebPack"
43-
os: osx
44-
env:
45-
- Webpack="iOS"
46-
osx_image: xcode9.2
47-
language: node_js
48-
node_js: "8"
49-
jdk: oraclejdk8
50-
before_install:
51-
- gem install cocoapods
52-
- pod repo update
53-
script: travis_wait travis_retry tns build ios --bundle
54-
- language: android
13+
language: android
5514
os: linux
5615
env:
57-
- Webpack="Android"
16+
- WebPack="Android"
5817
jdk: oraclejdk8
59-
before_install: nvm install 8.11.4
18+
before_install: nvm install stable
6019
script: travis_wait travis_retry tns build android --bundle
6120
- stage: "Build"
6221
env:
63-
- BuildAndroid="26"
22+
- BuildAndroid="28"
6423
language: android
6524
os: linux
6625
jdk: oraclejdk8
67-
before_install: nvm install 8.11.4
26+
before_install: nvm install stable
6827
script:
6928
- travis_wait travis_retry tns build android
7029
- os: osx
7130
env:
72-
- BuildiOS="11"
73-
- Xcode="9.2"
74-
osx_image: xcode9.2
31+
- BuildiOS="12"
32+
- Xcode="10.0"
33+
osx_image: xcode10.0
7534
language: node_js
7635
node_js: "8"
7736
jdk: oraclejdk8
@@ -80,3 +39,27 @@ matrix:
8039
- pod repo update
8140
script:
8241
- travis_wait travis_retry tns build ios
42+
43+
android:
44+
components:
45+
- tools
46+
- platform-tools
47+
- build-tools-28.0.3
48+
- android-28
49+
- extra-android-m2repository
50+
- sys-img-armeabi-v7a-android-21
51+
52+
before_install:
53+
# - sudo pip install --upgrade pip
54+
# - sudo pip install six
55+
56+
install:
57+
- echo no | npm install -g nativescript
58+
- tns usage-reporting disable
59+
- tns error-reporting disable
60+
- cd src
61+
- npm i --ignore-scripts
62+
- npm run tsc
63+
- npm run package
64+
- cd ../demo
65+
- npm i

CHANGELOG.md

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,51 @@
11
<img src="docs/images/firebase-logo.png" width="116px" height="32px" alt="Firebase"/>
22

3-
[Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
4-
[Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
3+
- [Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
4+
- [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
5+
6+
## 8.0.0 (2019, February X)
7+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/94?closed=1)
8+
9+
10+
## 7.7.0 (2019, January 20)
11+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/92?closed=1)
12+
13+
14+
## 7.6.1 (2019, January 8)
15+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/91?closed=1)
16+
17+
18+
## 7.6.0 (2018, December 21)
19+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/90?closed=1)
20+
21+
22+
## 7.5.1 (2018, December 15)
23+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/89?closed=1)
24+
25+
26+
## 7.5.0 (2018, December 15)
27+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/88?closed=1)
28+
29+
30+
## 7.4.6 (2018, December 10)
31+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/87?closed=1)
32+
33+
34+
## 7.4.5 (2018, December 10)
35+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/86?closed=1)
36+
37+
38+
## 7.4.4 (2018, December 8)
39+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/85?closed=1)
40+
41+
42+
## 7.4.3 (2018, December 3)
43+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/84?closed=1)
44+
45+
46+
## 7.4.2 (2018, November 16)
47+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/83?closed=1)
48+
549

650
## 7.4.1 (2018, November 10)
751
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/82?closed=1)

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# NativeScript Firebase plugin
22

3-
[![Build Status][build-status]][build-url]
43
[![NPM version][npm-image]][npm-url]
54
[![Downloads][downloads-image]][npm-url]
5+
[![TotalDownloads][total-downloads-image]][npm-url]
66
[![Twitter Follow][twitter-image]][twitter-url]
77

88
[build-status]:https://travis-ci.org/EddyVerbruggen/nativescript-plugin-firebase.svg?branch=master
99
[build-url]:https://travis-ci.org/EddyVerbruggen/nativescript-plugin-firebase
1010
[npm-image]:http://img.shields.io/npm/v/nativescript-plugin-firebase.svg
1111
[npm-url]:https://npmjs.org/package/nativescript-plugin-firebase
1212
[downloads-image]:http://img.shields.io/npm/dm/nativescript-plugin-firebase.svg
13+
[total-downloads-image]:http://img.shields.io/npm/dt/nativescript-plugin-firebase.svg?label=total%20downloads
1314
[twitter-image]:https://img.shields.io/twitter/follow/eddyverbruggen.svg?style=social&label=Follow%20me
1415
[twitter-url]:https://twitter.com/eddyverbruggen
1516

@@ -109,7 +110,7 @@ firebase.init({
109110
// Optionally pass in properties for database, authentication and cloud messaging,
110111
// see their respective docs.
111112
}).then(
112-
function (instance) {
113+
function () {
113114
console.log("firebase.init done");
114115
},
115116
function (error) {
@@ -126,7 +127,7 @@ firebase.init({
126127
// Optionally pass in properties for database, authentication and cloud messaging,
127128
// see their respective docs.
128129
}).then(
129-
instance => {
130+
() => {
130131
console.log("firebase.init done");
131132
},
132133
error => {
@@ -149,7 +150,7 @@ export class AppComponent implements OnInit {
149150
// Optionally pass in properties for database, authentication and cloud messaging,
150151
// see their respective docs.
151152
}).then(
152-
instance => {
153+
() => {
153154
console.log("firebase.init done");
154155
},
155156
error => {

demo-ng/app/App_Resources/Android/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
android:label="@string/app_name"
3131
android:theme="@style/AppTheme">
3232

33-
<meta-data
34-
android:name="com.facebook.sdk.ApplicationId"
35-
android:value="@string/facebook_app_id"/>
33+
<meta-data
34+
android:name="com.facebook.sdk.ApplicationId"
35+
android:value="@string/facebook_app_id"/>
3636

3737
<meta-data
3838
android:name="com.google.firebase.ml.vision.DEPENDENCIES"

demo-ng/app/app.component.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ const firebase = require("nativescript-plugin-firebase");
88
})
99

1010
export class AppComponent implements OnInit {
11-
ngOnInit(): void {
12-
firebase.init(
13-
{
14-
persist: false
15-
})
16-
.then(() => console.log(">>>>> Firebase initialized"))
17-
.catch(err => console.log(">>>>> Firebase init error: " + err));
11+
// using async-await just for show
12+
async ngOnInit(): Promise<void> {
13+
try {
14+
await firebase.init({
15+
persist: false
16+
});
17+
console.log(">>>>> Firebase initialized");
18+
} catch (err) {
19+
console.log(">>>>> Firebase init error: " + err);
20+
}
1821
}
1922
}

0 commit comments

Comments
 (0)