Skip to content

Commit a0b6ef3

Browse files
NathanWalkerNathanWalker
authored
feat: iOS SDK 11.5+, Android SDK 33.13+ (#281)
Updated iOS and Android SDKs. BREAKING CHANGE: `@nativescript/firebase-admob` renamed to `@nativescript/google-mobile-ads` and moved to https://github.com/NativeScript/plugins.
1 parent 66625a2 commit a0b6ef3

File tree

126 files changed

+353
-40596
lines changed

Some content is hidden

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

126 files changed

+353
-40596
lines changed

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
- [@nativescript/firebase-admob](packages/firebase-admob/README.md)
21
- [@nativescript/firebase-analytics](packages/firebase-analytics/README.md)
32
- [@nativescript/firebase-app-check](packages/firebase-app-check/README.md)
43
- [@nativescript/firebase-app-check-debug](packages/firebase-app-check-debug/README.md)

‎apps/demo-angular/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"@nativescript/firebase-database": "file:../../dist/packages/firebase-database",
88
"@nativescript/firebase-firestore": "file:../../dist/packages/firebase-firestore",
99
"@nativescript/firebase-analytics": "file:../../dist/packages/firebase-analytics",
10-
"@nativescript/firebase-admob": "file:../../dist/packages/firebase-admob",
1110
"@nativescript/firebase-crashlytics": "file:../../dist/packages/firebase-crashlytics",
1211
"@nativescript/firebase-app-check": "file:../../dist/packages/firebase-app-check",
1312
"@nativescript/firebase-remote-config": "file:../../dist/packages/firebase-remote-config",

‎apps/demo-angular/project.json

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,8 @@
1212
"production": true,
1313
"uglify": true,
1414
"release": true,
15-
"forDevice": true
16-
},
17-
"dependsOn": [
18-
{
19-
"target": "build.all",
20-
"dependencies": true
21-
}
22-
]
23-
},
24-
"ios": {
25-
"executor": "@nativescript/nx:build",
26-
"options": {
27-
"platform": "ios",
28-
"noHmr": true
29-
},
30-
"dependsOn": [
31-
{
32-
"target": "build.all",
33-
"dependencies": true
34-
}
35-
]
36-
},
37-
"android": {
38-
"executor": "@nativescript/nx:build",
39-
"options": {
40-
"platform": "android",
41-
"noHmr": true
15+
"forDevice": true,
16+
"tsConfig": "apps/demo-angular/tsconfig.json"
4217
},
4318
"dependsOn": [
4419
{
@@ -48,13 +23,21 @@
4823
]
4924
},
5025
"clean": {
51-
"executor": "@nativescript/nx:build",
52-
"options": {
53-
"clean": true
54-
}
26+
"executor": "@nativescript/nx:clean",
27+
"options": {}
5528
},
5629
"lint": {
5730
"executor": "@nx/eslint:lint"
31+
},
32+
"debug": {
33+
"executor": "@nativescript/nx:debug",
34+
"options": {
35+
"noHmr": true,
36+
"uglify": false,
37+
"release": false,
38+
"forDevice": false,
39+
"prepare": false
40+
}
5841
}
5942
}
6043
}

‎apps/demo-angular/src/app-routing.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { HomeComponent } from './home.component';
77
const routes: Routes = [
88
{ path: '', redirectTo: '/home', pathMatch: 'full' },
99
{ path: 'home', component: HomeComponent },
10-
{ path: 'firebase-admob', loadChildren: () => import('./plugin-demos/firebase-admob.module').then((m) => m.FirebaseAdmobModule) },
1110
{ path: 'firebase-analytics', loadChildren: () => import('./plugin-demos/firebase-analytics.module').then((m) => m.FirebaseAnalyticsModule) },
1211
{ path: 'firebase-app-check', loadChildren: () => import('./plugin-demos/firebase-app-check.module').then((m) => m.FirebaseAppCheckModule) },
1312
{ path: 'firebase-app-check-debug', loadChildren: () => import('./plugin-demos/firebase-app-check-debug.module').then((m) => m.FirebaseAppCheckDebugModule) },

‎apps/demo-angular/src/home.component.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import { Component } from '@angular/core';
66
})
77
export class HomeComponent {
88
demos = [
9-
{
10-
name: 'firebase-admob',
11-
},
129
{
1310
name: 'firebase-analytics',
1411
},

‎apps/demo-angular/src/plugin-demos/firebase-admob.component.html

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎apps/demo-angular/src/plugin-demos/firebase-admob.component.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎apps/demo-angular/src/plugin-demos/firebase-admob.module.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎apps/demo-angular/tsconfig.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
"@nativescript/firebase-database": ["packages/firebase-database/index.d.ts"],
1010
"@nativescript/firebase-firestore": ["packages/firebase-firestore/index.d.ts"],
1111
"@nativescript/firebase-analytics": ["packages/firebase-analytics/index.d.ts"],
12-
"@nativescript/firebase-admob": ["packages/firebase-admob/index.d.ts"],
13-
"@nativescript/firebase-admob/angular": ["packages/firebase-admob/angular/index.ts"],
1412
"@nativescript/firebase-crashlytics": ["packages/firebase-crashlytics/index.d.ts"],
1513
"@nativescript/firebase-app-check": ["packages/firebase-app-check/index.d.ts"],
1614
"@nativescript/firebase-remote-config": ["packages/firebase-remote-config/index.d.ts"],

‎apps/demo-vue/app/app.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import '@nativescript/firebase-performance';
2121
import '@nativescript/firebase-remote-config';
2222
import '@nativescript/firebase-storage';
2323

24-
import { Admob } from '@nativescript/firebase-admob';
25-
2624
import { AppCheck } from '@nativescript/firebase-app-check-debug';
2725
import { Application } from '@nativescript/core';
2826

@@ -35,8 +33,6 @@ firebase()
3533
firebase().crashlytics().setCrashlyticsCollectionEnabled(true);
3634
});
3735

38-
Admob.init();
39-
4036
const dynamicLinks = firebase().dynamicLinks();
4137

4238
dynamicLinks.onLink((link) => {

‎apps/demo-vue/app/components/Home.vue

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<script lang="ts">
2020
import Vue from 'nativescript-vue';
21-
import Admob from '../plugin-demos/firebase-admob.vue';
2221
import Analytics from '../plugin-demos/firebase-analytics.vue';
2322
import AppCheck from '../plugin-demos/firebase-app-check.vue';
2423
import AppCheckDebug from '../plugin-demos/firebase-app-check-debug.vue';
@@ -38,10 +37,6 @@ import RemoteConfig from '../plugin-demos/firebase-remote-config.vue';
3837
import Storage from '../plugin-demos/firebase-storage.vue';
3938
4039
const routes = [
41-
{
42-
name: 'firebase-admob',
43-
detail: Admob,
44-
},
4540
{
4641
name: 'firebase-analytics',
4742
detail: Analytics,
@@ -129,9 +124,6 @@ export default Vue.extend({
129124
},
130125
demos() {
131126
return [
132-
{
133-
name: 'firebase-admob',
134-
},
135127
{
136128
name: 'firebase-analytics',
137129
},

‎apps/demo-vue/app/plugin-demos/firebase-admob.vue

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎apps/demo-vue/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "NativeScript Application",
44
"dependencies": {
55
"@nativescript/core": "file:../../node_modules/@nativescript/core",
6-
"@nativescript/firebase-admob": "file:../../packages/firebase-admob",
76
"@nativescript/firebase-analytics": "file:../../dist/packages/firebase-analytics",
87
"@nativescript/firebase-app-check": "file:../../packages/firebase-app-check",
98
"@nativescript/firebase-auth": "file:../../packages/firebase-auth",

‎apps/demo-vue/project.json

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,8 @@
1111
"production": true,
1212
"uglify": true,
1313
"release": true,
14-
"forDevice": true
15-
},
16-
"dependsOn": [
17-
{
18-
"target": "build.all",
19-
"dependencies": true
20-
}
21-
]
22-
},
23-
"ios": {
24-
"executor": "@nativescript/nx:build",
25-
"options": {
26-
"platform": "ios",
27-
"noHmr": true
28-
},
29-
"dependsOn": [
30-
{
31-
"target": "build.all",
32-
"dependencies": true
33-
}
34-
]
35-
},
36-
"android": {
37-
"executor": "@nativescript/nx:build",
38-
"options": {
39-
"platform": "android",
40-
"noHmr": true
14+
"forDevice": true,
15+
"tsConfig": "apps/demo-vue/tsconfig.json"
4116
},
4217
"dependsOn": [
4318
{
@@ -47,13 +22,21 @@
4722
]
4823
},
4924
"clean": {
50-
"executor": "@nativescript/nx:build",
51-
"options": {
52-
"clean": true
53-
}
25+
"executor": "@nativescript/nx:clean",
26+
"options": {}
5427
},
5528
"lint": {
5629
"executor": "@nx/eslint:lint"
30+
},
31+
"debug": {
32+
"executor": "@nativescript/nx:debug",
33+
"options": {
34+
"noHmr": true,
35+
"uglify": false,
36+
"release": false,
37+
"forDevice": false,
38+
"prepare": false
39+
}
5740
}
5841
}
5942
}

‎apps/demo-vue/tsconfig.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
"@nativescript/firebase-database": ["../../packages/firebase-database/index.d.ts"],
1212
"@nativescript/firebase-firestore": ["../../packages/firebase-firestore/index.d.ts"],
1313
"@nativescript/firebase-analytics": ["../../packages/firebase-analytics/index.d.ts"],
14-
"@nativescript/firebase-admob": ["../../packages/firebase-admob/index.d.ts"],
15-
"@nativescript/firebase-admob/angular": ["../../packages/firebase-admob/angular/index.ts"],
1614
"@nativescript/firebase-crashlytics": ["../../packages/firebase-crashlytics/index.d.ts"],
1715
"@nativescript/firebase-app-check": ["../../packages/firebase-app-check/index.d.ts"],
1816
"@nativescript/firebase-remote-config": ["../../packages/firebase-remote-config/index.d.ts"],

‎apps/demo/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"repository": "<fill-your-repository-here>",
66
"dependencies": {
77
"@nativescript/core": "file:../../node_modules/@nativescript/core",
8-
"@nativescript/firebase-admob": "file:../../packages/firebase-admob",
98
"@nativescript/firebase-analytics": "file:../../dist/packages/firebase-analytics",
109
"@nativescript/firebase-app-check": "file:../../packages/firebase-app-check",
10+
"@nativescript/firebase-app-check-debug": "file:../../packages/firebase-app-check-debug",
1111
"@nativescript/firebase-auth": "file:../../packages/firebase-auth",
1212
"@nativescript/firebase-core": "file:../../packages/firebase-core",
1313
"@nativescript/firebase-crashlytics": "file:../../packages/firebase-crashlytics",
@@ -18,13 +18,12 @@
1818
"@nativescript/firebase-in-app-messaging": "file:../../packages/firebase-in-app-messaging",
1919
"@nativescript/firebase-installations": "file:../../packages/firebase-installations",
2020
"@nativescript/firebase-messaging": "file:../../packages/firebase-messaging",
21+
"@nativescript/firebase-messaging-core": "file:../../packages/firebase-messaging-core",
2122
"@nativescript/firebase-performance": "file:../../packages/firebase-performance",
2223
"@nativescript/firebase-remote-config": "file:../../packages/firebase-remote-config",
2324
"@nativescript/firebase-storage": "file:../../packages/firebase-storage",
24-
"@nativescript/google-signin": "~2.1.0",
25-
"@nativescript/firebase-app-check-debug": "file:../../packages/firebase-app-check-debug",
26-
"@nativescript/firebase-messaging-core": "file:../../packages/firebase-messaging-core",
27-
"@nativescript/firebase-ui": "file:../../packages/firebase-ui"
25+
"@nativescript/firebase-ui": "file:../../packages/firebase-ui",
26+
"@nativescript/google-signin": "~2.1.0"
2827
},
2928
"devDependencies": {
3029
"@nativescript/android": "~8.8.0",

‎apps/demo/project.json

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,8 @@
1212
"production": true,
1313
"uglify": true,
1414
"release": true,
15-
"forDevice": true
16-
},
17-
"dependsOn": [
18-
{
19-
"target": "build.all",
20-
"dependencies": true
21-
}
22-
]
23-
},
24-
"ios": {
25-
"executor": "@nativescript/nx:build",
26-
"options": {
27-
"platform": "ios",
28-
"noHmr": true
29-
},
30-
"dependsOn": [
31-
{
32-
"target": "build.all",
33-
"dependencies": true
34-
}
35-
]
36-
},
37-
"android": {
38-
"executor": "@nativescript/nx:build",
39-
"options": {
40-
"platform": "android",
41-
"noHmr": true
15+
"forDevice": true,
16+
"tsConfig": "apps/demo/tsconfig.json"
4217
},
4318
"dependsOn": [
4419
{
@@ -48,13 +23,21 @@
4823
]
4924
},
5025
"clean": {
51-
"executor": "@nativescript/nx:build",
52-
"options": {
53-
"clean": true
54-
}
26+
"executor": "@nativescript/nx:clean",
27+
"options": {}
5528
},
5629
"lint": {
5730
"executor": "@nx/eslint:lint"
31+
},
32+
"debug": {
33+
"executor": "@nativescript/nx:debug",
34+
"options": {
35+
"noHmr": true,
36+
"uglify": false,
37+
"release": false,
38+
"forDevice": false,
39+
"prepare": false
40+
}
5841
}
5942
}
6043
}

0 commit comments

Comments
 (0)