feat!: update to Capacitor 5 (#355)

capawesome-team · Apr 7, 2023 · 9711b58 · 9711b58
1 parent bfd1327
commit 9711b58
Show file tree

Hide file tree

Showing 53 changed files with 2,281 additions and 1,317 deletions.
diff --git a/.changeset/gorgeous-tomatoes-sniff.md b/.changeset/gorgeous-tomatoes-sniff.md
@@ -0,0 +1,12 @@
+---
+"@capacitor-firebase/analytics": major
+"@capacitor-firebase/app": major
+"@capacitor-firebase/app-check": major
+"@capacitor-firebase/authentication": major
+"@capacitor-firebase/crashlytics": major
+"@capacitor-firebase/messaging": major
+"@capacitor-firebase/performance": major
+"@capacitor-firebase/remote-config": major
+---
+
+feat!: update to Capacitor 5
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,17 +7,17 @@
   ],
   "scripts": {
     "verify": "npm run verify:android && npm run verify:ios && npm run verify:web",
-    "verify:android": "turbo run verify:android --concurrency=1",
-    "verify:ios": "turbo run verify:ios --concurrency=1",
-    "verify:web": "turbo run verify:web",
+    "verify:android": "turbo run verify:android --concurrency=1 --no-cache",
+    "verify:ios": "turbo run verify:ios --concurrency=1 --no-cache",
+    "verify:web": "turbo run verify:web --no-cache",
     "lint": "turbo run lint",
     "fmt": "turbo run fmt",
     "docgen": "turbo run docgen",
     "build": "turbo run build",
     "affected:verify": "npm run affected:verify:android && npm run affected:verify:ios && npm run affected:verify:web",
-    "affected:verify:android": "turbo run verify:android --since=origin/main --concurrency=1",
-    "affected:verify:ios": "turbo run verify:ios --since=origin/main --concurrency=1",
-    "affected:verify:web": "turbo run verify:web --since=origin/main",
+    "affected:verify:android": "turbo run verify:android --since=origin/main --concurrency=1 --no-cache",
+    "affected:verify:ios": "turbo run verify:ios --since=origin/main --concurrency=1 --no-cache",
+    "affected:verify:web": "turbo run verify:web --since=origin/main --no-cache",
     "affected:lint": "turbo run lint --since=origin/main",
     "affected:fmt": "turbo run fmt --since=origin/main",
     "affected:docgen": "turbo run docgen --since=origin/main",

diff --git a/packages/analytics/BREAKING.md b/packages/analytics/BREAKING.md
@@ -4,8 +4,21 @@ This is a comprehensive list of the breaking changes introduced in the major ver
 
 ## Versions
 
+- [Version 5.x.x](#version-5xx)
 - [Version 1.x.x](#version-1xx)
 
+## Version 5.x.x
+
+### Capacitor 5
+
+This plugin now supports Capacitor 5 only. Please run `npx cap sync` after updating this package.
+
+If you want to use this plugin with Capacitor 4, please install version `1.4.0`:
+
+```
+npm i @capacitor-firebase/analytics@1.4.0
+```
+
 ## Version 1.x.x
 
 ### Capacitor 4

diff --git a/packages/analytics/android/build.gradle b/packages/analytics/android/build.gradle
@@ -1,8 +1,8 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
     firebaseAnalyticsVersion = project.hasProperty('firebaseAnalyticsVersion') ? rootProject.ext.firebaseAnalyticsVersion : '21.2.0'
 }
 
@@ -12,17 +12,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
+    namespace "io.capawesome.capacitorjs.plugins.firebase.analytics"
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/packages/analytics/android/gradle.properties b/packages/analytics/android/gradle.properties
@@ -20,5 +20,3 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
diff --git a/packages/analytics/android/gradle/wrapper/gradle-wrapper.properties b/packages/analytics/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/analytics/android/src/main/AndroidManifest.xml b/packages/analytics/android/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.capawesome.capacitorjs.plugins.firebase.analytics">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/...src/main/java/io/capawesome/capacitorjs/plugins/firebase/analytics/FirebaseAnalytics.java b/...src/main/java/io/capawesome/capacitorjs/plugins/firebase/analytics/FirebaseAnalytics.java
@@ -61,7 +61,7 @@ public void run() {
             );
     }
 
-    public void logEvent(@NonNull String key, JSONObject json) {
+    public void logEvent(@NonNull String key, @Nullable JSONObject json) {
         Bundle bundle = FirebaseAnalyticsHelper.createBundleFromJson(json);
         analyticsInstance.logEvent(key, bundle);
     }

diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-firebase/analytics",
-  "version": "1.4.0",
+  "version": "4.0.0",
   "description": "Capacitor plugin for Firebase Analytics.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -55,11 +55,11 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "4.0.1",
-    "@capacitor/cli": "4.0.1",
-    "@capacitor/core": "4.0.1",
+    "@capacitor/android": "5.0.0-beta.1",
+    "@capacitor/cli": "5.0.0-beta.1",
+    "@capacitor/core": "5.0.0-beta.1",
     "@capacitor/docgen": "0.2.1",
-    "@capacitor/ios": "4.0.1",
+    "@capacitor/ios": "5.0.0-beta.1",
     "@ionic/eslint-config": "0.3.0",
     "@ionic/prettier-config": "1.0.1",
     "@ionic/swiftlint-config": "1.1.2",
@@ -73,7 +73,7 @@
     "typescript": "4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.0.0",
+    "@capacitor/core": "^5.0.0-beta.1",
     "firebase": "^9.0.0"
   },
   "peerDependenciesMeta": {

diff --git a/packages/app-check/BREAKING.md b/packages/app-check/BREAKING.md
@@ -1,3 +1,19 @@
 # Breaking Changes
 
 This is a comprehensive list of the breaking changes introduced in the major version releases of Capacitor Firebase App Check plugin.
+
+## Versions
+
+- [Version 5.x.x](#version-5xx)
+
+## Version 5.x.x
+
+### Capacitor 5
+
+This plugin now supports Capacitor 5 only. Please run `npx cap sync` after updating this package.
+
+If you want to use this plugin with Capacitor 4, please install version `1.4.0`:
+
+```
+npm i @capacitor-firebase/app-check@1.4.0
+```
diff --git a/packages/app-check/android/build.gradle b/packages/app-check/android/build.gradle
@@ -1,8 +1,8 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
     firebaseAppCheckPlayIntegrityVersion = project.hasProperty('firebaseAppCheckPlayIntegrityVersion') ? rootProject.ext.firebaseAppCheckPlayIntegrityVersion : '16.1.0'
     firebaseAppCheckDebugVersion = project.hasProperty('firebaseAppCheckDebugVersion') ? rootProject.ext.firebaseAppCheckDebugVersion : '16.1.0'
 }
@@ -13,17 +13,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
+    namespace "io.capawesome.capacitorjs.plugins.firebase.appcheck"
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/packages/app-check/android/gradle.properties b/packages/app-check/android/gradle.properties
@@ -20,5 +20,3 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
diff --git a/packages/app-check/android/gradle/wrapper/gradle-wrapper.properties b/packages/app-check/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/app-check/android/src/main/AndroidManifest.xml b/packages/app-check/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.capawesome.capacitorjs.plugins.firebase.appcheck">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/packages/app-check/package.json b/packages/app-check/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-firebase/app-check",
-  "version": "1.4.0",
+  "version": "4.0.0",
   "description": "Capacitor plugin for Firebase App Check.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -55,11 +55,11 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "4.0.1",
-    "@capacitor/cli": "4.0.1",
-    "@capacitor/core": "4.0.1",
+    "@capacitor/android": "5.0.0-beta.1",
+    "@capacitor/cli": "5.0.0-beta.1",
+    "@capacitor/core": "5.0.0-beta.1",
     "@capacitor/docgen": "0.2.1",
-    "@capacitor/ios": "4.0.1",
+    "@capacitor/ios": "5.0.0-beta.1",
     "@ionic/eslint-config": "0.3.0",
     "@ionic/prettier-config": "1.0.1",
     "@ionic/swiftlint-config": "1.1.2",
@@ -73,7 +73,7 @@
     "typescript": "4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.0.0",
+    "@capacitor/core": "^5.0.0-beta.1",
     "firebase": "^9.0.0"
   },
   "peerDependenciesMeta": {

diff --git a/packages/app/BREAKING.md b/packages/app/BREAKING.md
@@ -4,8 +4,21 @@ This is a comprehensive list of the breaking changes introduced in the major ver
 
 ## Versions
 
+- [Version 5.x.x](#version-5xx)
 - [Version 1.x.x](#version-1xx)
 
+## Version 5.x.x
+
+### Capacitor 5
+
+This plugin now supports Capacitor 5 only. Please run `npx cap sync` after updating this package.
+
+If you want to use this plugin with Capacitor 4, please install version `1.4.0`:
+
+```
+npm i @capacitor-firebase/app@1.4.0
+```
+
 ## Version 1.x.x
 
 ### Capacitor 4

diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle
@@ -1,8 +1,8 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
     firebaseCommonVersion = project.hasProperty('firebaseCommonVersion') ? rootProject.ext.firebaseCommonVersion : '20.2.0'
 }
 
@@ -12,17 +12,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
+    namespace "io.capawesome.capacitorjs.plugins.firebase.app"
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/packages/app/android/gradle.properties b/packages/app/android/gradle.properties
@@ -20,5 +20,3 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
diff --git a/packages/app/android/gradle/wrapper/gradle-wrapper.properties b/packages/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/app/android/src/main/AndroidManifest.xml b/packages/app/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.capawesome.capacitorjs.plugins.firebase.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-firebase/app",
-  "version": "1.4.0",
+  "version": "4.0.0",
   "description": "Capacitor plugin for Firebase App.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -55,11 +55,11 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "4.0.1",
-    "@capacitor/cli": "4.0.1",
-    "@capacitor/core": "4.0.1",
+    "@capacitor/android": "5.0.0-beta.1",
+    "@capacitor/cli": "5.0.0-beta.1",
+    "@capacitor/core": "5.0.0-beta.1",
     "@capacitor/docgen": "0.2.1",
-    "@capacitor/ios": "4.0.1",
+    "@capacitor/ios": "5.0.0-beta.1",
     "@ionic/eslint-config": "0.3.0",
     "@ionic/prettier-config": "1.0.1",
     "@ionic/swiftlint-config": "1.1.2",
@@ -73,7 +73,7 @@
     "typescript": "4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.0.0",
+    "@capacitor/core": "^5.0.0-beta.1",
     "firebase": "^9.0.0"
   },
   "peerDependenciesMeta": {