Merge branch 'develop' of github.com:TryQuiet/quiet into chore/bump-p…

…ackages
TryQuiet · Oct 11, 2023 · 25cb635 · 25cb635
2 parents eb59a01 + f478af3
commit 25cb635
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/packages/mobile/.detoxrc.js b/packages/mobile/.detoxrc.js
@@ -74,6 +74,12 @@ module.exports = {
         avdName: 'emulator',
       },
     },
+    emulator_ci: {
+      type: 'android.emulator',
+      device: {
+        avdName: 'Pixel_3a_API_34_arm64-v8a',
+      },
+    },
   },
   configurations: {
     'ios.sim.debug': {
@@ -135,6 +141,13 @@ module.exports = {
         rootDir: './e2e/artifacts/android',
       },
     },
+    'android.emu.debug.ci': {
+      device: 'emulator_ci',
+      app: 'android.debug',
+      artifacts: {
+        rootDir: './e2e/artifacts/android',
+      },
+    },
     'android.emu.storybook': {
       device: 'emulator',
       app: 'android.storybook',

diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
@@ -139,8 +139,11 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["arm64-v8a"]
 }
 
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
 android {
-    ndkPath NDK_PATH
+    ndkPath properties.getProperty('ndk.dir')
 
     ndkVersion rootProject.ext.ndkVersion
 

diff --git a/packages/mobile/android/gradle.properties b/packages/mobile/android/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 # org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.