Patch gradle deps to allow other sources

android/build.gradle

@@ -22,6 +22,7 @@ ext {
 
 buildscript {
     repositories {
+        mavenLocal()
         flatDir { dirs "libs", "${rootDir}/app/libs" }
         google()
         mavenCentral()

android/settings.gradle

@@ -1,14 +1,16 @@
 pluginManagement {
-include ':react-native-share'
-project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
   repositories {
       mavenLocal() // Let's prioritize local Maven repos so that Nix can provide them offline
+      mavenCentral()
+      google()
       gradlePluginPortal()
   }
 }
 
 rootProject.name = 'StatusIm'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
+include ':react-native-share'
+project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
 include ':react-native-nfc-manager'
 project(':react-native-nfc-manager').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-nfc-manager/android')
 include ':app'

nix/deps/gradle/deps.json

@@ -10021,20 +10021,20 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/core/jackson-annotations/2.17.2",
+    "path": "com/fasterxml/jackson/core/jackson-annotations/2.18.0-rc1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-annotations-2.17.2.pom": {
-        "sha1": "742d1e93e17a0ee2e37403439cdd80678ceedccd",
-        "sha256": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs="
+      "jackson-annotations-2.18.0-rc1.pom": {
+        "sha1": "276deb7ae7f5cc37d23a38989a78a57507bc7eed",
+        "sha256": "sha256-oRATGux6hy/fA91Oz5s5YRm1VNnMCxqlelPj3f8WQDE="
       },
-      "jackson-annotations-2.17.2.jar": {
-        "sha1": "147b7b9412ffff24339f8aba080b292448e08698",
-        "sha256": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE="
+      "jackson-annotations-2.18.0-rc1.jar": {
+        "sha1": "b9e146e8346b819e4bce934d41614cd3c248ac3d",
+        "sha256": "sha256-nC1/CioqhnDAEeEFJiyx24RN+GJlLgp1KH9uXk0ML4c="
       },
-      "jackson-annotations-2.17.2.module": {
-        "sha1": "0c39db486faed84c6298fc3c6db32af7f6c6ca5e",
-        "sha256": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688="
+      "jackson-annotations-2.18.0-rc1.module": {
+        "sha1": "1739c299ec680dc1491c74f15af0fbe54a5c4d31",
+        "sha256": "sha256-5wZ65mmjvbAkUEufgG7BaUxuoK3hRDgguzcoh8pXRw4="
       }
     }
   },
@@ -10055,20 +10055,20 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/core/jackson-core/2.17.2",
+    "path": "com/fasterxml/jackson/core/jackson-core/2.18.0-rc1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-core-2.17.2.pom": {
-        "sha1": "56ebdda21a42d361ae3811b39a7053fc305d584e",
-        "sha256": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs="
+      "jackson-core-2.18.0-rc1.pom": {
+        "sha1": "f6598c774d5b3b2e3569d3c193680675cab3ded9",
+        "sha256": "sha256-vBHD23/gCYWtOYutek+9twh84A1OXeXGiIqgxEZUHX8="
       },
-      "jackson-core-2.17.2.jar": {
-        "sha1": "969a35cb35c86512acbadcdbbbfb044c877db814",
-        "sha256": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y="
+      "jackson-core-2.18.0-rc1.jar": {
+        "sha1": "9baac744526012c59c575a02bde8bad10c0e1fd3",
+        "sha256": "sha256-fGA8E0M5arO7lfIJeC3idcyjDn/opy4CyTugOizYlVE="
       },
-      "jackson-core-2.17.2.module": {
-        "sha1": "f6853230bbbd73cfc6d53bb490311393df91d28f",
-        "sha256": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY="
+      "jackson-core-2.18.0-rc1.module": {
+        "sha1": "12dede64fc0d1405b279bb7bd6e3b6df33c401e5",
+        "sha256": "sha256-xl48rP7iAFN7/ld6XJFnw/GWJe7xXT2x6dGEQs0hGEY="
       }
     }
   },
@@ -10089,20 +10089,20 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/core/jackson-databind/2.17.2",
+    "path": "com/fasterxml/jackson/core/jackson-databind/2.18.0-rc1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-databind-2.17.2.pom": {
-        "sha1": "0091859e6b26ea19c60a35f49993f58c1c15d3bd",
-        "sha256": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI="
+      "jackson-databind-2.18.0-rc1.pom": {
+        "sha1": "884efde7eac9bf4ea9ed6d93bf087089c0eaf172",
+        "sha256": "sha256-YD5TutTqMOQzmqHxEAQ6Z+FYlV60TRswhvCBAEq4sJs="
       },
-      "jackson-databind-2.17.2.jar": {
-        "sha1": "e6deb029e5901e027c129341fac39e515066b68c",
-        "sha256": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw="
+      "jackson-databind-2.18.0-rc1.jar": {
+        "sha1": "f14e430aa7d04c1241cd5764013cd1fb33b94f00",
+        "sha256": "sha256-8HgR3EuBN2bzSGntJ7j7aZQos4m40zE1OW5JSrOzKY4="
       },
-      "jackson-databind-2.17.2.module": {
-        "sha1": "eaf601f0453b2fdd5048fdd12da745f8f435fb09",
-        "sha256": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8="
+      "jackson-databind-2.18.0-rc1.module": {
+        "sha1": "8afe869e3e0e194ecb0b1a61357635371feb774e",
+        "sha256": "sha256-xwQUM1Ea8gTx24zhQzom0MCgA/DIiRTzU6ebmBFw/GY="
       }
     }
   },
@@ -10134,12 +10134,12 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/jackson-base/2.17.2",
+    "path": "com/fasterxml/jackson/jackson-base/2.18.0-rc1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-base-2.17.2.pom": {
-        "sha1": "3264a20cda3d7b01815fb83a59cd124c25689f02",
-        "sha256": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68="
+      "jackson-base-2.18.0-rc1.pom": {
+        "sha1": "c1aaf1a35d2464e5e891e48d52adadc37a6193ab",
+        "sha256": "sha256-HGWLaQJXT/odhFEA4khtuk8SwBDMgDGWFweGfkOpVt4="
       }
     }
   },
@@ -10156,12 +10156,12 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/jackson-bom/2.17.2",
+    "path": "com/fasterxml/jackson/jackson-bom/2.18.0-rc1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-bom-2.17.2.pom": {
-        "sha1": "e772457e00739867a8f382ef0a8c4dcb03558772",
-        "sha256": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+      "jackson-bom-2.18.0-rc1.pom": {
+        "sha1": "fa17302fa20114e758a1e2394ac82804ddc67066",
+        "sha256": "sha256-7/5r2W/0xIfUwmNBrWhUgGawpyK2zP237wn2VRbQknk="
       }
     }
   },
@@ -10178,12 +10178,12 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/jackson-parent/2.17",
+    "path": "com/fasterxml/jackson/jackson-parent/2.18-rc1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-parent-2.17.pom": {
-        "sha1": "df97fedb1aae67d608a69fa9262410247f3d31af",
-        "sha256": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+      "jackson-parent-2.18-rc1.pom": {
+        "sha1": "37524f99cf067121ca21b7d3229324342bf4335f",
+        "sha256": "sha256-u9ZbiGL1WrZS/n4Dg49qwQynIUGsjsk2k0NaWgxY+u8="
       }
     }
   },
@@ -10200,12 +10200,12 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/module/jackson-modules-base/2.17.2",
+    "path": "com/fasterxml/jackson/module/jackson-modules-base/2.18.0-rc1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-modules-base-2.17.2.pom": {
-        "sha1": "b3007bc606cad1aad0f2b7f16af1977a26051b2f",
-        "sha256": "sha256-rrMBBVHhN9CeuDhPO4PCQSXcOSwqmHIexorT/4TlWSU="
+      "jackson-modules-base-2.18.0-rc1.pom": {
+        "sha1": "23cd0969e1a46558c6b99de29bfe8f1b7c996d54",
+        "sha256": "sha256-1QhPHKd7N6Da4fkGz4Hx3LF+ewUOXWYyokmxPgNma0Y="
       }
     }
   },
@@ -10226,20 +10226,20 @@
   },
 
   {
-    "path": "com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.2",
+    "path": "com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.18.0-rc1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "jackson-module-jaxb-annotations-2.17.2.pom": {
-        "sha1": "0ad8d1eb06b0e3242b1160d25d223f28978b8f8b",
-        "sha256": "sha256-L4BbIPMNTBlqQV+9HljEE1p71xh9LhnFae9Eo2dKjTs="
+      "jackson-module-jaxb-annotations-2.18.0-rc1.pom": {
+        "sha1": "2ff5a34de52e25debfa1c52ddcc5d5cbf69f9b64",
+        "sha256": "sha256-RTdvvE7ToPc/eMsnOEstuJDJ244ikIQkaXP25AKN4Xs="
       },
-      "jackson-module-jaxb-annotations-2.17.2.jar": {
-        "sha1": "c2978b818ef2f2b2738b387c143624eab611d917",
-        "sha256": "sha256-hVYckOm941aaaI9XQQvelGFAs1Wr3XCuwFP+yVTjAaY="
+      "jackson-module-jaxb-annotations-2.18.0-rc1.jar": {
+        "sha1": "95b085253d574ae37fd92cbbc9d8939051b57f27",
+        "sha256": "sha256-083oiKh1HKLqQTDz7aWimJ95qu9s7qoydvwCSVMI3Ow="
       },
-      "jackson-module-jaxb-annotations-2.17.2.module": {
-        "sha1": "a7fe515d7d0ca4c75c58c6aa381d7f68bbaeb5ac",
-        "sha256": "sha256-JR4jRcce8k2uUpe84BAk2ESa3L6IJimArNCt1fiTil4="
+      "jackson-module-jaxb-annotations-2.18.0-rc1.module": {
+        "sha1": "2e0743404e71110c72a67112ee336b4700e49a59",
+        "sha256": "sha256-YE//5aKOfa47dngcLPU2lX4N6eOJnmUKE/uJMxh99a0="
       }
     }
   },
@@ -10271,12 +10271,12 @@
   },
 
   {
-    "path": "com/fasterxml/oss-parent/58",
+    "path": "com/fasterxml/oss-parent/61",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "oss-parent-58.pom": {
-        "sha1": "0ed9e5d9e7cad24fce51b18455e0cf5ccd2c94b6",
-        "sha256": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
+      "oss-parent-61.pom": {
+        "sha1": "8a4169cc2907589f72b053e7b9b02cb741bf1e46",
+        "sha256": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
       }
     }
   },
@@ -14691,6 +14691,21 @@
     }
   },
 
+  {
+    "path": "javax/xml/bind/jaxb-api/2.2.12",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "jaxb-api-2.2.12.pom": {
+        "sha1": "650e118d32cfcbbe5da8727ccda4023e4b2331bc",
+        "sha256": "sha256-Gs08hdTP48Sa4eKsKXdCujnaW7swo60OQXbqbGNI/O8="
+      },
+      "jaxb-api-2.2.12.jar": {
+        "sha1": "4c83805595b15acf41d71d49e3add7c0e85baaed",
+        "sha256": "sha256-aKYh7BhIX5UdCax29D5X7uOU2+QsuPKkxZyTKW+p3MY="
+      }
+    }
+  },
+
   {
     "path": "javax/xml/bind/jaxb-api/2.3.1",
     "repo": "https://repo.maven.apache.org/maven2",

nix/deps/gradle/deps.urls

@@ -609,25 +609,25 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloa
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.5/soloader-0.10.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.2/jackson-annotations-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.18.0-rc1/jackson-annotations-2.18.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.2/jackson-core-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.18.0-rc1/jackson-core-2.18.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.2/jackson-databind-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.18.0-rc1/jackson-databind-2.18.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.2/jackson-base-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.18.0-rc1/jackson-base-2.18.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.2/jackson-bom-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.18.0-rc1/jackson-bom-2.18.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.17/jackson-parent-2.17.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.18-rc1/jackson-parent-2.18-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.2/jackson-modules-base-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.18.0-rc1/jackson-modules-base-2.18.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.2/jackson-module-jaxb-annotations-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.18.0-rc1/jackson-module-jaxb-annotations-2.18.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/58/oss-parent-58.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/61/oss-parent-61.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/woodstox/woodstox-core/6.2.1/woodstox-core-6.2.1.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
@@ -942,6 +942,7 @@ https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.3.1/jaxb-api-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.4.0-b180830.0359/jaxb-api-parent-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jaxb-api-2.2.12-b140109.1041.pom
+https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12/jaxb-api-2.2.12.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180830.0359/jaxb-api-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.pom

nix/mobile/android/build.nix

@@ -152,7 +152,6 @@ in stdenv.mkDerivation rec {
     gradleCommand = ''
       ${pkgs.gradle}/bin/gradle \
       --console=plain \
-      --offline \
       --no-daemon \
       --no-scan \
       --no-watch-fs \
@@ -169,7 +168,10 @@ in stdenv.mkDerivation rec {
     # Fixes issue with failing to load libnative-platform.so
     export GRADLE_USER_HOME=$(mktemp -d)
     export ANDROID_SDK_HOME=$(mktemp -d)
-
+
+    # we use this env to tell gradle we are in the build nix derivation
+    export IN_NIX_BUILD_DERIVATION="TRUE"
+
     echo "Adhoc ENV: ${adhocEnvVars}"
     echo "Running: ${gradleCommand}"
 

nix/pkgs/patch-maven-srcs/default.nix

@@ -9,15 +9,12 @@ writeScript "patch-maven-srcs" (''
   source ${stdenv}/setup
 
   function patchMavenSource() {
-    grep "$source" $1 > /dev/null && \
-      substituteInPlace $1 --replace "$2" "$3" 2>/dev/null
+    if [ "$IN_NIX_BUILD_DERIVATION" = "TRUE" ]; then
+      sed -i '/repositories {/a \    mavenLocal()' "$1"
+    fi
   }
 
   gradleFile="$1"
 
-  # Some of those find something, some don't, that's fine.
-  patchMavenSource "$gradleFile" 'mavenCentral()'       'mavenLocal()'
-  patchMavenSource "$gradleFile" 'google()'             'mavenLocal()'
-  patchMavenSource "$gradleFile" 'jcenter()'            'mavenLocal()'
-  patchMavenSource "$gradleFile" 'gradlePluginPortal()' 'mavenLocal()'
+  patchMavenSource "$gradleFile"
 '')

patches/settings.gradle.kts.patch

@@ -0,0 +1,10 @@
+--- /tmp/tmp-status-mobile-a82c91fdb/tmp.Y8PU8VldXR/settings.gradle.kts	2024-09-03 14:59:49.071068000 +0530
++++ ./node_modules/@react-native/gradle-plugin/settings.gradle.kts	2024-09-03 15:00:08.292388770 +0530
+@@ -13,6 +13,6 @@
+   }
+ }
+
+-plugins { id("org.gradle.toolchains.foojay-resolver-convention").version("0.5.0") }
++plugins { id("org.gradle.toolchains.foojay-resolver-convention").version("0.8.0") }
+
+ rootProject.name = "react-native-gradle-plugin"