diff --git a/.gitattributes b/.gitattributes
index d42ff18..45a3dcb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
-*.pbxproj -text
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf
diff --git a/.prettierrc.js b/.prettierrc.js
index 2e800bf..0816c6f 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -4,4 +4,5 @@ module.exports = {
singleQuote: true,
trailingComma: 'all',
tabWidth: 4,
+ arrowParens: 'avoid',
};
diff --git a/_editorconfig b/_editorconfig
new file mode 100644
index 0000000..7c28613
--- /dev/null
+++ b/_editorconfig
@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8f440b1..dbb86da 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -122,6 +122,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
def enableHermes = project.ext.react.get("enableHermes", false);
android {
+ ndkVersion rootProject.ext.ndkVersion
+
compileSdkVersion rootProject.ext.compileSdkVersion
compileOptions {
@@ -134,8 +136,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
missingDimensionStrategy 'react-native-camera', 'general'
- versionCode 6
- versionName "1.8"
+ versionCode 59
+ versionName "1.11"
}
splits {
abi {
@@ -155,7 +157,7 @@ android {
release {
storeFile file('release.keystore')
storePassword ''
- keyAlias 'Galleon-Mobile-Release-Key'
+ keyAlias ''
keyPassword ''
}
}
@@ -182,11 +184,12 @@ android {
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
// https://developer.android.com/studio/build/configure-apk-splits.html
+ // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride =
- versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+ defaultConfig.versionCode * 1000 + versionCodes.get(abi)
}
}
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index bf192a7..255c860 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -4,5 +4,10 @@
-
+
+
+
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index d666b46..06ea2c0 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
-