From 45cabbf94b14801ec656f3b280afe292a3bf02cf Mon Sep 17 00:00:00 2001 From: "aman.singh" Date: Mon, 25 Nov 2024 17:41:00 +0530 Subject: [PATCH] NTP-6335|merging of tele-master to master| Aman Singh --- .gitignore | 6 +++++- buildFlavor/field/buildNumber.txt | 1 + buildFlavor/field/buildVersion.txt | 1 + buildFlavor/tele/buildNumber.txt | 1 + buildFlavor/tele/buildVersion.txt | 1 + package.json | 18 +++++++++++------- scripts/buildScript.sh | 11 +++++++++++ 7 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 buildFlavor/field/buildNumber.txt create mode 100644 buildFlavor/field/buildVersion.txt create mode 100644 buildFlavor/tele/buildNumber.txt create mode 100644 buildFlavor/tele/buildVersion.txt create mode 100755 scripts/buildScript.sh diff --git a/.gitignore b/.gitignore index 12ed79f2..efb5aa9f 100644 --- a/.gitignore +++ b/.gitignore @@ -66,4 +66,8 @@ buck-out/ /ios/Pods/ /vendor/bundle/ /android/app/src/main/res/values/strings.xml -.eslintcache \ No newline at end of file +.eslintcache + + +/buildNumber.txt +/buildVersion.txt \ No newline at end of file diff --git a/buildFlavor/field/buildNumber.txt b/buildFlavor/field/buildNumber.txt new file mode 100644 index 00000000..e99fdcc5 --- /dev/null +++ b/buildFlavor/field/buildNumber.txt @@ -0,0 +1 @@ +217 \ No newline at end of file diff --git a/buildFlavor/field/buildVersion.txt b/buildFlavor/field/buildVersion.txt new file mode 100644 index 00000000..25dc7aca --- /dev/null +++ b/buildFlavor/field/buildVersion.txt @@ -0,0 +1 @@ +2.15.3 \ No newline at end of file diff --git a/buildFlavor/tele/buildNumber.txt b/buildFlavor/tele/buildNumber.txt new file mode 100644 index 00000000..58dc5afc --- /dev/null +++ b/buildFlavor/tele/buildNumber.txt @@ -0,0 +1 @@ +303 \ No newline at end of file diff --git a/buildFlavor/tele/buildVersion.txt b/buildFlavor/tele/buildVersion.txt new file mode 100644 index 00000000..707b39b9 --- /dev/null +++ b/buildFlavor/tele/buildVersion.txt @@ -0,0 +1 @@ +100.1.3 \ No newline at end of file diff --git a/package.json b/package.json index 4265750d..debd05af 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,12 @@ "android-field:dev": "yarn move:dev && react-native run-android --variant=fieldAgentsQADebug", "android-field:qa": "yarn move:qa && react-native run-android --variant=fieldAgentsQADebug", "android-field:prod": "yarn move:prod && react-native run-android --variant=fieldAgentsProdDebug", - "release-field:dev": "yarn move:dev && react-native run-android --variant=fieldAgentsQARelease && cd android && ./gradlew assemblefieldAgentsQARelease", - "release-field:qa": "yarn move:qa && react-native run-android --variant=fieldAgentsQARelease && cd android && ./gradlew assemblefieldAgentsQARelease", - "release-field:prod": "yarn move:prod && react-native run-android --variant=fieldAgentsProdRelease && cd android && ./gradlew assemblefieldAgentsProdRelease", - "android-calling:dev": "yarn move:dev && react-native run-android --variant=callingAgentsQADebug", - "android-calling:qa": "yarn move:qa && react-native run-android --variant=callingAgentsQADebug", - "android-calling:prod": "yarn move:prod && react-native run-android --variant=callingAgentsProdDebug", + "release-field:dev": "yarn move:dev && yarn prepare-field-build && react-native run-android --variant=fieldAgentsQARelease && cd android && ./gradlew assemblefieldAgentsQARelease", + "release-field:qa": "yarn move:qa && yarn prepare-field-build && react-native run-android --variant=fieldAgentsQARelease && cd android && ./gradlew assemblefieldAgentsQARelease", + "release-field:prod": "yarn move:prod && yarn prepare-field-build && react-native run-android --variant=fieldAgentsProdRelease && cd android && ./gradlew assemblefieldAgentsProdRelease", + "android-calling:dev": "yarn move:dev && yarn prepare-tele-build && react-native run-android --variant=callingAgentsQADebug", + "android-calling:qa": "yarn move:qa && yarn prepare-tele-build && react-native run-android --variant=callingAgentsQADebug", + "android-calling:prod": "yarn move:prod && yarn prepare-tele-build && react-native run-android --variant=callingAgentsProdDebug", "release-calling:dev": "yarn move:dev && react-native run-android --variant=callingAgentsQARelease && cd android && ./gradlew assemblecallingAgentsQARelease", "release-calling:qa": "yarn move:qa && react-native run-android --variant=callingAgentsQARelease && cd android && ./gradlew assemblecallingAgentsQARelease", "release-calling:prod": "yarn move:prod && react-native run-android --variant=callingAgentsProdRelease && cd android && ./gradlew assemblecallingAgentsProdRelease", @@ -30,7 +30,11 @@ "move:prod": "cp -f ./config/prod/config.js ./src/constants && cp -f ./config/prod/google-services.json ./android/app", "debug": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res", "prepare": "husky install", - "postinstall": "patch-package" + "postinstall": "patch-package", + "copy-tele-assets": "cp buildFlavor/tele/buildNumber.txt ./ && cp buildFlavor/tele/buildVersion.txt ./ ", + "copy-field-assets": "cp buildFlavor/field/buildNumber.txt ./ && cp buildFlavor/field/buildVersion.txt ./ ", + "prepare-tele-build": "yarn copy-tele-assets && chmod +x ./scripts/buildScript.sh && ./scripts/buildScript.sh", + "prepare-field-build": "yarn copy-field-assets && chmod +x ./scripts/buildScript.sh && ./scripts/buildScript.sh" }, "dependencies": { "@bam.tech/react-native-image-resizer": "3.0.5", diff --git a/scripts/buildScript.sh b/scripts/buildScript.sh new file mode 100755 index 00000000..33c2f66e --- /dev/null +++ b/scripts/buildScript.sh @@ -0,0 +1,11 @@ +ENV_BUILD_NUMBER=`cat ./buildNumber.txt` +ENV_BUILD_VERSION=`cat ./buildVersion.txt` + +# Use double quotes so variables are expanded +sed -i '' "s/^\(def VERSION_CODE = \).*/\1${ENV_BUILD_NUMBER}/" android/app/build.gradle +sed -i '' "s/^\(def VERSION_NAME = \).*/\1\"${ENV_BUILD_VERSION}\"/" android/app/build.gradle + +sed -i '' 's/"version": "[^"]*"/"version": "'${ENV_BUILD_VERSION}'"/' ./package.json +sed -i '' 's/"buildNumber": "[^"]*"/"buildNumber": "'${ENV_BUILD_NUMBER}'"/' ./package.json + +