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

Commit 35108ab

Browse files
EddyVerbruggenEddyVerbruggen
committed
bug: Crashlytics + Android Runtime 5.0 incompatible #1023 
1 parent 1155c31 commit 35108ab

File tree

8 files changed

+44
-25
lines changed

8 files changed

+44
-25
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
- [Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
44
- [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
55

6+
## 7.4.2 (2018, November 16)
7+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/83?closed=1)
8+
9+
610
## 7.4.1 (2018, November 10)
711
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/82?closed=1)
812

‎demo-ng/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"nativescript-angular": "^6.1.0",
2626
"nativescript-camera": "^4.0.2",
2727
"nativescript-imagepicker": "~6.0.4",
28-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.1.tgz",
28+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.2.tgz",
2929
"nativescript-theme-core": "~1.0.4",
3030
"reflect-metadata": "~0.1.10",
3131
"rxjs": "~6.0.0 || >=6.1.0",

‎demo-push/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
},
1111
"dependencies": {
12-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.0.tgz",
12+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.2.tgz",
1313
"nativescript-theme-core": "^1.0.4",
1414
"nativescript-unit-test-runner": "^0.3.4",
1515
"tns-core-modules": "~4.2.0"

‎demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"firebase-functions": "^2.0.5",
13-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.0.tgz",
13+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.4.2.tgz",
1414
"nativescript-theme-core": "^1.0.4",
1515
"nativescript-unit-test-runner": "^0.3.4",
1616
"tns-core-modules": "^4.2.1"

‎docs/CRASHREPORTING.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<img src="https://raw.githubusercontent.com/EddyVerbruggen/nativescript-plugin-firebase/master/docs/images/features/crashlytics.png" height="85px" alt="Crashlytics"/>
22

3-
> ⚠️ The NativeScript **5** Android runtime is currently **NOT** compatible with Crashlytics. See [#1023](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/1023).
4-
53
> Firebase Crash reporting is deprecated - use Crashlytics if you can!
64
7-
85
## Enabling Crash Reporting / Crashlytics
96
Since version 5.3.0 you can choose either Crashlytics (recommended) or the older Firebase Crash Reporting (which doesn't really work on iOS).
107
You will be prompted during installation of the plugin to enable either Crashlytics or Crash Reporting (both are off by default).

‎publish/scripts/installer.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -994,11 +994,9 @@ var copyPlist = function(copyPlistOpts) {
994994
}
995995

996996
function writeGoogleServiceGradleHook(result) {
997-
console.log("Install firebase-build-gradle hook.");
998997
try {
999998
var scriptContent =
1000-
`
1001-
var path = require("path");
999+
`var path = require("path");
10021000
var fs = require("fs");
10031001
10041002
module.exports = function($logger, $projectData) {
@@ -1031,12 +1029,12 @@ module.exports = function($logger, $projectData) {
10311029
buildGradleContent = buildGradleContent.replace(googleServicesPattern, latestGoogleServicesPlugin);
10321030
} else {
10331031
buildGradleContent = buildGradleContent.replace(gradlePattern, function (match) {
1034-
return match + '\\n ' + latestGoogleServicesPlugin;
1032+
return match + '\\n ' + latestGoogleServicesPlugin;
10351033
});
10361034
}
10371035
10381036
buildGradleContent = buildGradleContent.replace("com.android.tools.build:gradle:3.2.0", "com.android.tools.build:gradle:3.2.1");
1039-
1037+
10401038
fs.writeFileSync(projectBuildGradlePath, buildGradleContent);
10411039
}
10421040
@@ -1050,14 +1048,26 @@ task copyMetadata {
10501048
doLast {
10511049
copy {
10521050
from "$projectDir/src/main/assets/metadata"
1053-
def toDir = project.hasProperty("release") ? "release" : "debug";
1054-
if (new File("$projectDir/build/intermediates/assets").listFiles() != null) {
1051+
def toDir = project.hasProperty("release") ? "release" : "debug"
1052+
def toAssetsDir = "assets"
1053+
1054+
if (new File("$projectDir/build/intermediates/merged_assets").listFiles() != null) {
1055+
toAssetsDir = "merged_assets"
1056+
toDir = new File("$projectDir/build/intermediates/merged_assets").listFiles()[0].name
1057+
if (toDir == 'debug') {
1058+
toDir += "/mergeDebugAssets"
1059+
} else {
1060+
toDir += "/mergeReleaseAssets"
1061+
}
1062+
toDir += "/out"
1063+
} else if (new File("$projectDir/build/intermediates/assets").listFiles() != null) {
10551064
toDir = new File("$projectDir/build/intermediates/assets").listFiles()[0].name
10561065
if (toDir != 'debug' && toDir != 'release') {
10571066
toDir += "/release"
10581067
}
10591068
}
1060-
into "$projectDir/build/intermediates/assets/" + toDir + "/metadata"
1069+
1070+
into "$projectDir/build/intermediates/" + toAssetsDir + "/" + toDir + "/metadata"
10611071
}
10621072
}
10631073
}\`;
@@ -1069,7 +1079,6 @@ task copyMetadata {
10691079
});
10701080
};
10711081
`;
1072-
console.log("Writing 'firebase-build-gradle.js' to " + appRoot + "hooks/after-prepare");
10731082
var scriptPath = path.join(appRoot, "hooks", "after-prepare", "firebase-build-gradle.js");
10741083
fs.writeFileSync(scriptPath, scriptContent);
10751084
} catch (e) {

‎src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-plugin-firebase",
3-
"version": "7.4.1",
3+
"version": "7.4.2",
44
"description": "Fire. Base. Firebase!",
55
"main": "firebase",
66
"typings": "index.d.ts",

‎src/scripts/postinstall.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3792,11 +3792,9 @@ var copyPlist = function(copyPlistOpts) {
37923792
}
37933793

37943794
function writeGoogleServiceGradleHook(result) {
3795-
console.log("Install firebase-build-gradle hook.");
37963795
try {
37973796
var scriptContent =
3798-
`
3799-
var path = require("path");
3797+
`var path = require("path");
38003798
var fs = require("fs");
38013799
38023800
module.exports = function($logger, $projectData) {
@@ -3829,12 +3827,12 @@ module.exports = function($logger, $projectData) {
38293827
buildGradleContent = buildGradleContent.replace(googleServicesPattern, latestGoogleServicesPlugin);
38303828
} else {
38313829
buildGradleContent = buildGradleContent.replace(gradlePattern, function (match) {
3832-
return match + '\\n ' + latestGoogleServicesPlugin;
3830+
return match + '\\n ' + latestGoogleServicesPlugin;
38333831
});
38343832
}
38353833
38363834
buildGradleContent = buildGradleContent.replace("com.android.tools.build:gradle:3.2.0", "com.android.tools.build:gradle:3.2.1");
3837-
3835+
38383836
fs.writeFileSync(projectBuildGradlePath, buildGradleContent);
38393837
}
38403838
@@ -3848,14 +3846,26 @@ task copyMetadata {
38483846
doLast {
38493847
copy {
38503848
from "$projectDir/src/main/assets/metadata"
3851-
def toDir = project.hasProperty("release") ? "release" : "debug";
3852-
if (new File("$projectDir/build/intermediates/assets").listFiles() != null) {
3849+
def toDir = project.hasProperty("release") ? "release" : "debug"
3850+
def toAssetsDir = "assets"
3851+
3852+
if (new File("$projectDir/build/intermediates/merged_assets").listFiles() != null) {
3853+
toAssetsDir = "merged_assets"
3854+
toDir = new File("$projectDir/build/intermediates/merged_assets").listFiles()[0].name
3855+
if (toDir == 'debug') {
3856+
toDir += "/mergeDebugAssets"
3857+
} else {
3858+
toDir += "/mergeReleaseAssets"
3859+
}
3860+
toDir += "/out"
3861+
} else if (new File("$projectDir/build/intermediates/assets").listFiles() != null) {
38533862
toDir = new File("$projectDir/build/intermediates/assets").listFiles()[0].name
38543863
if (toDir != 'debug' && toDir != 'release') {
38553864
toDir += "/release"
38563865
}
38573866
}
3858-
into "$projectDir/build/intermediates/assets/" + toDir + "/metadata"
3867+
3868+
into "$projectDir/build/intermediates/" + toAssetsDir + "/" + toDir + "/metadata"
38593869
}
38603870
}
38613871
}\`;
@@ -3867,7 +3877,6 @@ task copyMetadata {
38673877
});
38683878
};
38693879
`;
3870-
console.log("Writing 'firebase-build-gradle.js' to " + appRoot + "hooks/after-prepare");
38713880
var scriptPath = path.join(appRoot, "hooks", "after-prepare", "firebase-build-gradle.js");
38723881
fs.writeFileSync(scriptPath, scriptContent);
38733882
} catch (e) {

0 commit comments

Comments
 (0)