diff --git a/.gitignore b/.gitignore index d356a39..7e5503c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ ios/Index/DataStore build/ .idea .gradle -local.properties +*.properties *.iml *.hprof diff --git a/android/app/build.gradle b/android/app/build.gradle index 3172475..0605e3f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,6 +1,8 @@ apply plugin: "com.android.application" import com.android.build.OutputFile +import java.util.Properties +import java.io.FileInputStream /** * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets @@ -125,6 +127,16 @@ def enableHermes = project.ext.react.get("enableHermes", false); */ def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures") +// Create a variable called keystorePropertiesFile, and initialize it to your +// keystore.properties file, in the rootProject folder. +def keystorePropertiesFile = rootProject.file("keystore.properties") + +// Initialize a new Properties() object called keystoreProperties. +def keystoreProperties = new Properties() + +// Load your keystore.properties file into the keystoreProperties object. +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + android { ndkVersion rootProject.ext.ndkVersion compileSdkVersion rootProject.ext.compileSdkVersion @@ -150,6 +162,10 @@ android { keyPassword 'android' } release { + storeFile file('drip-release-key.keystore') + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storePassword keystoreProperties['storePassword'] if (project.hasProperty('DRIP_RELEASE_STORE_FILE')) { storeFile file(DRIP_RELEASE_STORE_FILE) storePassword DRIP_RELEASE_STORE_PASSWORD diff --git a/package.json b/package.json index fa9377b..f41f288 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "prop-types": "^15.8.1", "react": "17.0.2", "react-i18next": "^12.0.0", - "react-native": "0.68.3", + "react-native": "0.68.5", "react-native-calendars": "^1.1287.0", "react-native-document-picker": "^8.1.1", "react-native-fs": "^2.20.0", diff --git a/yarn.lock b/yarn.lock index 7c44be2..4a50e2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6378,7 +6378,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -promise@^8.0.3: +promise@^8.2.0: version "8.3.0" resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a" integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg== @@ -6508,10 +6508,10 @@ react-native-calendars@^1.1287.0: optionalDependencies: moment "^2.29.4" -react-native-codegen@^0.0.17: - version "0.0.17" - resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.17.tgz#83fb814d94061cbd46667f510d2ddba35ffb50ac" - integrity sha512-7GIEUmAemH9uWwB6iYXNNsPoPgH06pxzGRmdBzK98TgFBdYJZ7CBuZFPMe4jmHQTPOkQazKZ/w5O6/71JBixmw== +react-native-codegen@^0.0.18: + version "0.0.18" + resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.18.tgz#99d6623d65292e8ce3fdb1d133a358caaa2145e7" + integrity sha512-XPI9aVsFy3dvgDZvyGWrFnknNiyb22kg5nHgxa0vjWTH9ENLBgVRZt9A64xHZ8BYihH+gl0p/1JNOCIEUzRPBg== dependencies: "@babel/parser" "^7.14.0" flow-parser "^0.121.0" @@ -6601,10 +6601,10 @@ react-native-version@^3.1.0: resolve-from "^5.0.0" semver "^6.0.0" -react-native@0.68.3: - version "0.68.3" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.3.tgz#07ac7374acde9bc5e80f9e473e03d6b730528f1c" - integrity sha512-LPgLQ4e96NWCrJPKlXzKfvlg1ddhfUplsEg00/cfBIMFZPJn2inzo9Rym8I/JYjmRORe4GjGY8kOem72hPm0Lw== +react-native@0.68.5: + version "0.68.5" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.5.tgz#8ba7389e00b757c59b6ea23bf38303d52367d155" + integrity sha512-t3kiQ/gumFV+0r/NRSIGtYxanjY4da0utFqHgkMcRPJVwXFWC0Fr8YiOeRGYO1dp8EfrSsOjtfWic/inqVYlbQ== dependencies: "@jest/create-cache-key-function" "^27.0.1" "@react-native-community/cli" "^7.0.3" @@ -6626,9 +6626,9 @@ react-native@0.68.3: metro-source-map "0.67.0" nullthrows "^1.1.1" pretty-format "^26.5.2" - promise "^8.0.3" + promise "^8.2.0" react-devtools-core "^4.23.0" - react-native-codegen "^0.0.17" + react-native-codegen "^0.0.18" react-native-gradle-plugin "^0.0.6" react-refresh "^0.4.0" react-shallow-renderer "16.14.1"