From 4c870143aa383fbcd854340340bdd7ff7814c023 Mon Sep 17 00:00:00 2001
From: UnschooledGamer <76094069+UnschooledGamer@users.noreply.github.com>
Date: Mon, 27 Apr 2026 21:52:56 +0530
Subject: [PATCH 1/7] chore(devcontainer): fix dockerfile broken yarn repo in
 base image

---
 .devcontainer/Dockerfile        |  6 +++++-
 .devcontainer/devcontainer.json | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 761820702..edea5ae20 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -8,7 +8,7 @@
 FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
 
 ARG ANDROID_PLATFORM=35
-ARG ANDROID_BUILD_TOOLS=35.0.0
+ARG ANDROID_BUILD_TOOLS=36.0.0
 ARG CMDLINE_TOOLS_VERSION=11076708
 ARG NODE_VERSION=22
 ARG GRADLE_VERSION=8.11
@@ -18,9 +18,13 @@ ENV ANDROID_SDK_ROOT=/opt/android-sdk
 ENV GRADLE_HOME=/opt/gradle
 ENV PATH="${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${GRADLE_HOME}/bin"
 
+# removes broken yarn repo present in base image
+RUN rm -f /etc/apt/sources.list.d/yarn.list
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
     wget \
     unzip \
+    curl \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Gradle
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a4a3827ab..c5067346d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,17 +1,17 @@
 {
   "name": "Acode Development",
-  "image": "mcr.microsoft.com/devcontainers/java:1-21-bullseye",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+
+  "containerEnv": {
+  "JAVA_HOME": "/usr/local/openjdk-21"
+},
+"remoteEnv": {
+  "JAVA_HOME": "/usr/local/openjdk-21"
+},
 
   "features": {
-    "ghcr.io/devcontainers/features/java:1": {
-      "installGradle": true,
-      "installGroovy": false,
-      "installMaven": false,
-      "installAnt": false,
-      "version": "21",
-      "jdkDistro": "ms",
-      "gradleVersion": "latest"
-    },
     "ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {
       "platform": "35",
       "build_tools": "35.0.0"
@@ -24,9 +24,9 @@
       "nvmVersion": "latest"
     }
   },
-
+  "overrideCommand": true,
   "postCreateCommand": "pnpm run setup",
-
+  "remoteUser": "root",
   "customizations": {
     "vscode": {
       "extensions": ["biomejs.biome", "redhat.java"],

From 748dd87fbf0c04f5e0bf73333a32e117e38ee78f Mon Sep 17 00:00:00 2001
From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:41:06 +0530
Subject: [PATCH 2/7] Update .devcontainer/devcontainer.json

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
---
 .devcontainer/devcontainer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c5067346d..595234bc3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,11 +5,11 @@
   },
 
   "containerEnv": {
-  "JAVA_HOME": "/usr/local/openjdk-21"
-},
-"remoteEnv": {
-  "JAVA_HOME": "/usr/local/openjdk-21"
-},
+    "JAVA_HOME": "/usr/local/openjdk-21"
+  },
+  "remoteEnv": {
+    "JAVA_HOME": "/usr/local/openjdk-21"
+  },
 
   "features": {
     "ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {

From def1fcc7584e6e0040ada25d9ac6324ff158cb86 Mon Sep 17 00:00:00 2001
From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:49:33 +0530
Subject: [PATCH 3/7] Update Dockerfile

---
 .devcontainer/Dockerfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index edea5ae20..910f0afc9 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -34,15 +34,16 @@ RUN wget -q "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-
     && ln -s /opt/gradle-${GRADLE_VERSION} ${GRADLE_HOME}
 
 # Install fnm and Node.js
-ENV FNM_DIR=/usr/local/fnm
-ENV PATH="${FNM_DIR}:${PATH}"
-RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "${FNM_DIR}" --skip-shell \
-    && eval "$(${FNM_DIR}/fnm env)" \
-    && fnm install ${NODE_VERSION} \
-    && fnm default ${NODE_VERSION} \
-    && npm install -g pnpm
+# Not required, mostly. When dev containers are used. 
+# ENV FNM_DIR=/usr/local/fnm
+# ENV PATH="${FNM_DIR}:${PATH}"
+# RUN curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "${FNM_DIR}" --skip-shell \
+#    && eval "$(${FNM_DIR}/fnm env)" \
+#    && fnm install ${NODE_VERSION} \
+#    && fnm default ${NODE_VERSION} \
+#    && npm install -g pnpm
 
-ENV PATH="${FNM_DIR}/aliases/default/bin:${PATH}"
+# ENV PATH="${FNM_DIR}/aliases/default/bin:${PATH}"
 
 # Install Android SDK
 RUN mkdir -p ${ANDROID_HOME}/cmdline-tools \

From 7da39e9cc44eeac9f75cc0304bedffc423ab60f0 Mon Sep 17 00:00:00 2001
From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:55:13 +0530
Subject: [PATCH 4/7] Update devcontainer.json

---
 .devcontainer/devcontainer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 595234bc3..a40d3ae21 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,8 +13,8 @@
 
   "features": {
     "ghcr.io/nordcominc/devcontainer-features/android-sdk:1": {
-      "platform": "35",
-      "build_tools": "35.0.0"
+      "platform": "36",
+      "build_tools": "36.0.0"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "nodeGypDependencies": false,

From 9f166755a0d38d842c012b7a698a67135b5548a8 Mon Sep 17 00:00:00 2001
From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
Date: Mon, 27 Apr 2026 22:55:57 +0530
Subject: [PATCH 5/7] Update Dockerfile

---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 910f0afc9..1d296d915 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -7,7 +7,7 @@
 
 FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
 
-ARG ANDROID_PLATFORM=35
+ARG ANDROID_PLATFORM=36
 ARG ANDROID_BUILD_TOOLS=36.0.0
 ARG CMDLINE_TOOLS_VERSION=11076708
 ARG NODE_VERSION=22

From 9fea25c39987561f2e379d2715ef153de1780791 Mon Sep 17 00:00:00 2001
From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:06:53 +0530
Subject: [PATCH 6/7] Update devcontainer.json

---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a40d3ae21..58656a504 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -25,7 +25,7 @@
     }
   },
   "overrideCommand": true,
-  "postCreateCommand": "pnpm run setup",
+  "postCreateCommand": "npm i -g pnpm && pnpm run setup",
   "remoteUser": "root",
   "customizations": {
     "vscode": {

From 0129870dd730db8e5bdb78db51a0d20231b10e96 Mon Sep 17 00:00:00 2001
From: Emmanuel Lobo <76094069+UnschooledGamer@users.noreply.github.com>
Date: Mon, 27 Apr 2026 23:30:54 +0530
Subject: [PATCH 7/7] remove: redundant pnpm installation.

---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 58656a504..a40d3ae21 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -25,7 +25,7 @@
     }
   },
   "overrideCommand": true,
-  "postCreateCommand": "npm i -g pnpm && pnpm run setup",
+  "postCreateCommand": "pnpm run setup",
   "remoteUser": "root",
   "customizations": {
     "vscode": {