From 6060cb457d43df36cbbaf9664274520ac1a17a75 Mon Sep 17 00:00:00 2001 From: Ammar Ahmed Date: Sat, 29 Nov 2025 00:01:56 +0500 Subject: [PATCH] mobile: fix failing build errors on android --- apps/mobile/android/app/build.gradle | 1 + apps/mobile/android/app/proguard-rules.pro | 5 +- packages/editor-mobile/package-lock.json | 3 - packages/editor/package-lock.json | 73 ++-------------------- 4 files changed, 11 insertions(+), 71 deletions(-) diff --git a/apps/mobile/android/app/build.gradle b/apps/mobile/android/app/build.gradle index 5ab1add25..dfe31c857 100644 --- a/apps/mobile/android/app/build.gradle +++ b/apps/mobile/android/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: "com.android.application" apply plugin: "org.jetbrains.kotlin.android" apply plugin: "com.facebook.react" +apply plugin: 'kotlin-parcelize' apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" diff --git a/apps/mobile/android/app/proguard-rules.pro b/apps/mobile/android/app/proguard-rules.pro index c635f55cc..a7a15d14e 100644 --- a/apps/mobile/android/app/proguard-rules.pro +++ b/apps/mobile/android/app/proguard-rules.pro @@ -63,4 +63,7 @@ -keepattributes Signature -keep class com.google.gson.reflect.TypeToken { *; } -keep class * extends com.google.gson.reflect.TypeToken --keep class com.streetwriters.notesnook.datatypes.* { *; } \ No newline at end of file +-keep class com.streetwriters.notesnook.datatypes.* { *; } + +-keep class net.gotev.uploadservice.* { *; } +-keep class kotlinx.parcelize.* { *; } \ No newline at end of file diff --git a/packages/editor-mobile/package-lock.json b/packages/editor-mobile/package-lock.json index 616f2ccf9..3678cbd2e 100644 --- a/packages/editor-mobile/package-lock.json +++ b/packages/editor-mobile/package-lock.json @@ -85,9 +85,6 @@ "@tiptap/extension-placeholder": "2.6.6", "@tiptap/extension-subscript": "2.6.6", "@tiptap/extension-superscript": "2.6.6", - "@tiptap/extension-table": "2.6.6", - "@tiptap/extension-table-cell": "2.6.6", - "@tiptap/extension-table-header": "2.6.6", "@tiptap/extension-table-row": "2.6.6", "@tiptap/extension-task-item": "2.6.6", "@tiptap/extension-task-list": "2.6.6", diff --git a/packages/editor/package-lock.json b/packages/editor/package-lock.json index b865641ed..24efdf2f0 100644 --- a/packages/editor/package-lock.json +++ b/packages/editor/package-lock.json @@ -1532,39 +1532,6 @@ "@styled-system/css": "^5.1.5" } }, - "node_modules/@theme-ui/color-modes": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@theme-ui/color-modes/-/color-modes-0.16.2.tgz", - "integrity": "sha512-jWEWx53lxNgWCT38i/kwLV2rsvJz8lVZgi5oImnVwYba9VejXD23q1ckbNFJHosQ8KKXY87ht0KPC6BQFIiHtQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@theme-ui/core": "^0.16.2", - "@theme-ui/css": "^0.16.2", - "deepmerge": "^4.2.2" - }, - "peerDependencies": { - "@emotion/react": "^11.11.1", - "react": ">=18" - } - }, - "node_modules/@theme-ui/color-modes/node_modules/@theme-ui/core": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@theme-ui/core/-/core-0.16.2.tgz", - "integrity": "sha512-bBd/ltbwO9vIUjF1jtlOX6XN0IIOdf1vzBp2JCKsSOqdfn84m+XL8OogIe/zOhQ+aM94Nrq4+32tFJc8sFav4Q==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@theme-ui/css": "^0.16.2", - "deepmerge": "^4.2.2" - }, - "peerDependencies": { - "@emotion/react": "^11.11.1", - "react": ">=18" - } - }, "node_modules/@theme-ui/components": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/@theme-ui/components/-/components-0.16.1.tgz", @@ -1610,39 +1577,6 @@ "@emotion/react": "^11.11.1" } }, - "node_modules/@theme-ui/theme-provider": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@theme-ui/theme-provider/-/theme-provider-0.16.2.tgz", - "integrity": "sha512-LRnVevODcGqO0JyLJ3wht+PV3ZoZcJ7XXLJAJWDoGeII4vZcPQKwVy4Lpz/juHsZppQxKcB3U+sQDGBnP25irQ==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@theme-ui/color-modes": "^0.16.2", - "@theme-ui/core": "^0.16.2", - "@theme-ui/css": "^0.16.2" - }, - "peerDependencies": { - "@emotion/react": "^11.11.1", - "react": ">=18" - } - }, - "node_modules/@theme-ui/theme-provider/node_modules/@theme-ui/core": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@theme-ui/core/-/core-0.16.2.tgz", - "integrity": "sha512-bBd/ltbwO9vIUjF1jtlOX6XN0IIOdf1vzBp2JCKsSOqdfn84m+XL8OogIe/zOhQ+aM94Nrq4+32tFJc8sFav4Q==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@theme-ui/css": "^0.16.2", - "deepmerge": "^4.2.2" - }, - "peerDependencies": { - "@emotion/react": "^11.11.1", - "react": ">=18" - } - }, "node_modules/@tiptap/core": { "version": "2.6.6", "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.6.6.tgz", @@ -3516,7 +3450,8 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "node_modules/js-yaml": { "version": "3.14.1", @@ -3636,6 +3571,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -5158,6 +5094,7 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -5178,6 +5115,7 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.2" @@ -5492,6 +5430,7 @@ "version": "0.23.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0" }