diff --git a/android/app/build.gradle b/android/app/build.gradle index 614fd5c9..69182fd5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -121,9 +121,11 @@ def jscFlavor = 'org.webkit:android-jsc:+' * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode * and the benefits of using Hermes will therefore be sharply reduced. */ -def enableHermes = project.ext.react.get("enableHermes", false); +def enableHermes = project.ext.react.get("enableHermes", true); android { + ndkVersion rootProject.ext.ndkVersion + compileSdkVersion rootProject.ext.compileSdkVersion compileOptions { @@ -180,7 +182,7 @@ android { 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 99e38fc5..32862006 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -3,5 +3,10 @@ - + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 3e83a287..00c8fe89 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -32,6 +32,5 @@ - diff --git a/android/app/src/main/java/com/xmflsct/app/tooot/generated/BasePackageList.java b/android/app/src/main/java/com/xmflsct/app/tooot/generated/BasePackageList.java index 16cc0d7a..08d117d7 100644 --- a/android/app/src/main/java/com/xmflsct/app/tooot/generated/BasePackageList.java +++ b/android/app/src/main/java/com/xmflsct/app/tooot/generated/BasePackageList.java @@ -8,8 +8,8 @@ public class BasePackageList { public List getPackageList() { return Arrays.asList( new expo.modules.application.ApplicationPackage(), - new expo.modules.av.AVPackage(), new expo.modules.constants.ConstantsPackage(), + new expo.modules.av.AVPackage(), new expo.modules.crypto.CryptoPackage(), new expo.modules.device.DevicePackage(), new expo.modules.errorrecovery.ErrorRecoveryPackage(), @@ -19,13 +19,13 @@ public class BasePackageList { new expo.modules.font.FontLoaderPackage(), new expo.modules.haptics.HapticsPackage(), new expo.modules.imageloader.ImageLoaderPackage(), + new expo.modules.permissions.PermissionsPackage(), new expo.modules.imagepicker.ImagePickerPackage(), new expo.modules.keepawake.KeepAwakePackage(), new expo.modules.lineargradient.LinearGradientPackage(), new expo.modules.localization.LocalizationPackage(), new expo.modules.location.LocationPackage(), new expo.modules.notifications.NotificationsPackage(), - new expo.modules.permissions.PermissionsPackage(), new expo.modules.screencapture.ScreenCapturePackage(), new expo.modules.securestore.SecureStorePackage(), new expo.modules.splashscreen.SplashScreenPackage(), diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 52c9e4cf..5e7427df 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -4,12 +4,12 @@ standalone="yes" ?> - -