diff --git a/android/build.gradle.nix b/android/build.gradle.nix index 54bb78da7..f5a505ae8 100644 --- a/android/build.gradle.nix +++ b/android/build.gradle.nix @@ -124,8 +124,7 @@ android.applicationVariants.all { variant -> dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.google.firebase:firebase-iid:20.2.3' - implementation 'com.google.firebase:firebase-messaging:20.2.3' + implementation 'androidx.core:core:1.0.0' ${additionalDependencies} } diff --git a/android/defaults/deps.nix b/android/defaults/deps.nix index f033cc3ea..ce4db95ca 100644 --- a/android/defaults/deps.nix +++ b/android/defaults/deps.nix @@ -743,86 +743,6 @@ pomSha256 = "c460902ddf5ece68832c6b271ce52a0928b05cf3a6ac81a8f548c73cbd541138"; aarSha256 = null; } - { artifactId = "firebase-common"; - groupId = "com.google.firebase"; - version = "19.3.0"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "d11dd4923436f29d301d0d8fc0e03a3497bce181e572c54a74cb84b925b3a085"; - aarSha256 = "7bd7971470ff943e3c3abb1d7809ef5cb4b81f1996be0867714372b3efa7405a"; } - - { artifactId = "firebase-components"; - groupId = "com.google.firebase"; - version = "16.0.0"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "5c5d0a5f811e4eb7512ea7aba70241ebeb27b9e195fbdea9b2c4b914272c326e"; - aarSha256 = "8ef43b412de4ec3e36a87c66d8a0a14a3de0a2e8566946da6a0e799b7fdd8ec9"; } - - { artifactId = "firebase-datatransport"; - groupId = "com.google.firebase"; - version = "17.0.3"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "04bd79c377c7b03fe3d4a5f26b90b0cfb0654c2d3b5c8dcfa6e90fcb1cb8d5d4"; - aarSha256 = "10c9f65c4f897ea33d028e46226daaabdfee43ac712559e5570d21b6b58a067e"; } - - { artifactId = "firebase-encoders-json"; - groupId = "com.google.firebase"; - version = "16.0.0"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "dcaf1909552a73b2f7081768d687331e09200b7afeddd5be7712291cf1359425"; - aarSha256 = "d1769fcec2a424ee7f92b9996c4b5c1dff0dfa27ceed28981b857b144fb5ec49"; } - - { artifactId = "firebase-iid"; - groupId = "com.google.firebase"; - version = "20.2.3"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "e0e27db2be35f8b5e2d73eb37d0b2431ecb5337e55bb74c04aa816ff279dc2a3"; - aarSha256 = "4ee59ef2d256a1c64bb55665d9fd3ca822e371e36d3a9b901582a9fb426d657c"; } - - { artifactId = "firebase-iid-interop"; - groupId = "com.google.firebase"; - version = "17.0.0"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "d01b366337829913fb0efc8c17388ad9673e3531fddf48d2f76d63e21bc5e788"; - aarSha256 = "b6f4ad581eb489370be3bf38a4bdabfc6ea3d4e716234c625a0f42516c53523c"; } - - { artifactId = "firebase-installations"; - groupId = "com.google.firebase"; - version = "16.3.2"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "8de71da34dc282a211b256e5872083937857d8781fcdbcac086d38ed0982d41b"; - aarSha256 = "0d0f88b3c3789d5fe1aa9a69bd5ab6c0e92036fcf34520775a0091e37268dd3f"; } - - { artifactId = "firebase-installations-interop"; - groupId = "com.google.firebase"; - version = "16.0.0"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "623c9a2cc9d554afae478e0c82f644df9dc55efb2fb2491fd22761094f73287e"; - aarSha256 = "d498fe20e7d2c65fc8f7124f1c1791d2828bebdf6bf06ab4cdee13e7fe9ccaa2"; } - - { artifactId = "firebase-measurement-connector"; - groupId = "com.google.firebase"; - version = "18.0.0"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "24bd1b4a8f81aea76ae30054df6343b5c0abc27024a5f6fb9c6ee7d4ffb86533"; - aarSha256 = "17e8b9b60ac0a79fcbed754d03d4b966cc5bb8837e79c2308bf2970f1d05700c"; } - - { artifactId = "firebase-messaging"; - groupId = "com.google.firebase"; - version = "20.2.3"; - repo = "https://maven.google.com/"; - jarSha256 = null; - pomSha256 = "78c2c4b37726c4ef475eb20f9864bf09f95b6ae2e95f6ef1d9bd869bc5e2eac5"; - aarSha256 = "6c188ff01e9ac4e714bb26c95a920c35d98ec0c324724d13de0ea3539423cdd0"; } - { artifactId = "google-services"; groupId = "com.google.gms"; version = "4.3.3"; diff --git a/android/defaults/pom.xml b/android/defaults/pom.xml index 90b0ae3c6..26af95692 100644 --- a/android/defaults/pom.xml +++ b/android/defaults/pom.xml @@ -38,16 +38,9 @@ 4.3.3 - com.google.firebase - firebase-iid - 20.2.3 - aar - - - com.google.firebase - firebase-messaging - 20.2.3 - aar + androidx.core + androidx-core + 1.0.0