Skip to content

feat: v3 #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# [3.0.0-alpha.0](https://github.com/nativescript/firebase/compare/2.5.2...3.0.0-alpha.0) (2023-03-23)


### Bug Fixes

* **crashlytics/ios:** record stacktrace for JS errors ([#177](https://github.com/nativescript/firebase/issues/177)) ([155cae4](https://github.com/nativescript/firebase/commit/155cae441ba3ffe7c2038d410edcb7a6de990f9f))
* remove buildShortDynamicLink call ([#179](https://github.com/nativescript/firebase/issues/179)) ([85c3a4f](https://github.com/nativescript/firebase/commit/85c3a4f53ea744a099013c0894a215552cb5ccbc))


### Features

* **dynamic-links:** forward errors to application ([#176](https://github.com/nativescript/firebase/issues/176)) ([a50026e](https://github.com/nativescript/firebase/commit/a50026e59392d2733989f07523d0fc26eb062654))
* v3 ([0eebaa7](https://github.com/nativescript/firebase/commit/0eebaa7fa5fbf5889d0220e0c1bf2ea454fb18ee))



## [2.5.2](https://github.com/nativescript/firebase/compare/2.5.1...2.5.2) (2022-12-27)


Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "plugins",
"version": "2.5.2",
"version": "3.0.0",
"license": "MIT",
"scripts": {
"postinstall": "husky install && npx ts-patch install",
Expand Down Expand Up @@ -29,21 +29,20 @@
"@angular/router": "^15.0.0",
"@nativescript/angular": "^15.0.0",
"@nativescript/core": "~8.4.0",
"@nativescript/plugin-tools": "5.0.2",
"@nativescript/plugin-tools": "5.1.0",
"@nativescript/types": "~8.4.0",
"@nativescript/webpack": "~5.0.5",
"@ngtools/webpack": "^15.0.0",
"conventional-changelog-cli": "^2.2.2",
"husky": "^8.0.0",
"nativescript-permissions": "1.3.11",
"nativescript-vue": "~2.9.0",
"nativescript-vue-template-compiler": "~2.9.0",
"ng-packagr": "^15.0.0",
"rxjs": "~7.5.0",
"rxjs": "~7.6.0",
"stacktrace-js": "~2.0.2",
"typescript": "~4.8.0",
"vue": "~2.6.12",
"zone.js": "~0.11.1"
"zone.js": "~0.13.0"
},
"lint-staged": {
"**/*.{js,ts,scss,json,html}": [
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase-admob/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nativescript/firebase-admob",
"version": "2.5.2",
"version": "3.0.0",
"description": "NativeScript Firebase - Admob",
"main": "index",
"typings": "index.d.ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.nativescript.firebase.admob">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<application android:hardwareAccelerated="true" />
Expand Down
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion packages/firebase-admob/platforms/android/include.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
dependencies {
implementation 'com.google.android.gms:play-services-ads:20.6.0'
implementation 'com.google.android.gms:play-services-ads:21.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.0.0'
implementation 'androidx.core:core-ktx:1.6.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ private const val ADMOB_ID_KEY = "adMobAppId"

private const val CONTENT_URL_KEY = "contentUrl"
private const val KEYWORDS_KEY = "keywords"
private const val LOCATION_KEY = "location"
private const val LOCATION_LATITUDE_KEY = "lat"
private const val LOCATION_LONGITUDE_KEY = "lon"
private const val LOCATION_ACCURACY_KEY = "locationAccuracy"
private const val NETWORK_EXTRAS_KEY = "networkExtras"
private const val REQUEST_AGENT_KEY = "requestAgent"
private const val REQUEST_NON_PERSONALIZED_ADS_ONLY_KEY = "requestNonPersonalizedAdsOnly"
Expand Down Expand Up @@ -804,22 +800,6 @@ class FirebaseAdmob {
}
}

json.optJSONObject(LOCATION_KEY)?.let {
val location = Location("")
if (it.has(LOCATION_LATITUDE_KEY)) {
location.latitude = it.getDouble(LOCATION_LATITUDE_KEY)
}

if (it.has(LOCATION_LONGITUDE_KEY)) {
location.longitude = it.getDouble(LOCATION_LONGITUDE_KEY)
}

if (it.has(LOCATION_ACCURACY_KEY)) {
location.accuracy = it.getDouble(LOCATION_ACCURACY_KEY).toFloat()
}
adRequest.setLocation(location)
}

val extras = Bundle()


Expand Down
2 changes: 1 addition & 1 deletion packages/firebase-admob/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
use_frameworks!
pod 'Google-Mobile-Ads-SDK', '~> 9.10.0'
pod 'Google-Mobile-Ads-SDK', '~> 10.2.0'
15 changes: 0 additions & 15 deletions packages/firebase-admob/src-native/android/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions packages/firebase-admob/src-native/android/.idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion packages/firebase-admob/src-native/android/.idea/.name

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions packages/firebase-admob/src-native/android/.idea/compiler.xml

This file was deleted.

22 changes: 0 additions & 22 deletions packages/firebase-admob/src-native/android/.idea/gradle.xml

This file was deleted.

9 changes: 0 additions & 9 deletions packages/firebase-admob/src-native/android/.idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions packages/firebase-admob/src-native/android/.idea/vcs.xml

This file was deleted.

Loading