diff --git a/.circleci/config.yml b/.circleci/config.yml index f6d53162b..593692b6c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -220,6 +220,7 @@ jobs: - store_artifacts: path: packages/openchs-android/android/app/build/generated/sourcemaps/react/<< pipeline.parameters.flavor >>Release/index.android.bundle.map destination: sourcemap-<< pipeline.parameters.flavor >>-live-<< pipeline.parameters.versionName >>-<< pipeline.git.revision >>.map + - run: make deploy_platform_translations_for_flavor_live - run: curl -L https://github.com/google/bundletool/releases/download/1.15.1/bundletool-all-1.15.1.jar > ./bundletool.jar - run: java -jar ./bundletool.jar build-apks --bundle=packages/openchs-android/android/app/build/outputs/bundle/<< pipeline.parameters.flavor >>Release/app-<< pipeline.parameters.flavor >>-release.aab --output=avniuniversal.apks --mode=universal --ks=packages/openchs-android/android/app/<< pipeline.parameters.flavor >>-release-key.keystore --ks-pass=pass:$<< parameters.keystore_password >> --ks-key-alias=$<< parameters.key_alias >> --key-pass=pass:$<< parameters.key_password >> - store_artifacts: diff --git a/Makefile b/Makefile index ff762373b..c3482a037 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,6 @@ ifndef flavor endif flavor_folder_uppercase_path:=$(shell echo "$(flavor)" | awk '{print toupper(substr($$0,1,1)) (substr($$0,2))}') -#flavor_folder_uppercase_path:=$(shell echo "$(flavor)" | awk '{print toupper(substr($$0,1,1)) tolower(substr($$0,2))}') ifeq ($(flavor), lfe) sourcemap_file_path:=../../../../index.android.bundle.map else @@ -156,10 +155,10 @@ release: release_clean metro_config create_apk upload-release-sourcemap bundle_release: release_clean metro_config create_bundle upload-release-sourcemap release_dev: setup_hosts as_dev release -release_prod_without_clean: as_prod release +release_prod_without_clean: as_prod release upload-release-sourcemap release_prod: renew_env release_prod_without_clean -bundle_release_prod_without_clean: as_prod bundle_release +bundle_release_prod_without_clean: as_prod bundle_release upload-release-sourcemap bundle_release_prod: renew_env bundle_release_prod_without_clean bundle_clean: diff --git a/packages/openchs-android/config/flavor_config.json b/packages/openchs-android/config/flavor_config.json index 9904ffb5a..b5dc3eeb8 100644 --- a/packages/openchs-android/config/flavor_config.json +++ b/packages/openchs-android/config/flavor_config.json @@ -29,7 +29,7 @@ "sakhi": { "server_url": "https://server.avniproject.org", "package_name": "org.sakhi.openchsclient", - "prod_admin_password_env_var_name": "OPENCHS_STAGING_ADMIN_PASSWORD", + "prod_admin_password_env_var_name": "OPENCHS_PROD_ADMIN_PASSWORD", "bugsnag": { "project_name": "avni-client", "env_var_name": "OPENCHS_CLIENT_BUGSNAG_API_KEY" diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json index cb1bf7ef0..879408101 100644 --- a/packages/openchs-android/package-lock.json +++ b/packages/openchs-android/package-lock.json @@ -34,7 +34,7 @@ "lodash": "4.17.21", "moment": "2.29.4", "native-base": "3.4.9", - "openchs-models": "1.30.68", + "openchs-models": "1.30.69", "prop-types": "15.8.1", "react": "18.2.0", "react-native": "0.72.3", @@ -16437,11 +16437,13 @@ } }, "node_modules/openchs-models": { - "version": "1.30.68", - "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.30.68.tgz", - "integrity": "sha512-jZYaBXCQW1suIyOVJfr5jTBGyKJsyBDatXffN+IpaJ+Em086PueywVb/Qisndpu9T16pZ8Tq3E8+gmjexAUg7A==", + "version": "1.30.69", + "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.30.69.tgz", + "integrity": "sha512-zMrdlpd4AyoYPeRv5sklp+TRcoY9QQszeXKqUQXaukMPqZvXuVP7rUAvqeHpSYmzVwsKCzGlnT9GqqouKKSaTg==", + "dependencies": { + "@ungap/structured-clone": "^1.2.0" + }, "peerDependencies": { - "@ungap/structured-clone": "*", "lodash": "*", "moment": "*" } @@ -35143,9 +35145,12 @@ } }, "openchs-models": { - "version": "1.30.68", - "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.30.68.tgz", - "integrity": "sha512-jZYaBXCQW1suIyOVJfr5jTBGyKJsyBDatXffN+IpaJ+Em086PueywVb/Qisndpu9T16pZ8Tq3E8+gmjexAUg7A==" + "version": "1.30.69", + "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.30.69.tgz", + "integrity": "sha512-zMrdlpd4AyoYPeRv5sklp+TRcoY9QQszeXKqUQXaukMPqZvXuVP7rUAvqeHpSYmzVwsKCzGlnT9GqqouKKSaTg==", + "requires": { + "@ungap/structured-clone": "^1.2.0" + } }, "opencollective-postinstall": { "version": "2.0.3", diff --git a/packages/openchs-android/package.json b/packages/openchs-android/package.json index 3014dd487..5d81284ea 100644 --- a/packages/openchs-android/package.json +++ b/packages/openchs-android/package.json @@ -58,7 +58,7 @@ "lodash": "4.17.21", "moment": "2.29.4", "native-base": "3.4.9", - "openchs-models": "1.30.68", + "openchs-models": "1.30.69", "prop-types": "15.8.1", "react": "18.2.0", "react-native": "0.72.3",