Files
doneit-web/version/git-version.ts
T
Peter Maquiran b83fff6fbd remove sentry
2022-12-23 12:23:16 +01:00

12 lines
9.4 KiB
TypeScript

export let versionData = {
"shortSHA": "d8ac3d3b3",
"SHA": "d8ac3d3b3d35cde1a6ea62ac17a02a15a0b66187",
"branch": "develop_bitOut-fix",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Dec 22 17:59:49 2022 +0100'",
"lastCommitMessage": "improve",
"lastCommitNumber": "4569",
"change": "diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json\nindex efe947a63..08a376b77 100644\n--- a/android/app/src/main/assets/capacitor.plugins.json\n+++ b/android/app/src/main/assets/capacitor.plugins.json\n@@ -9,51 +9,51 @@\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/app\",\n-\t\t\"classpath\": \"com.gpr.plugins.app.AppPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.app.AppPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/browser\",\n-\t\t\"classpath\": \"com.gpr.plugins.browser.BrowserPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.browser.BrowserPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/camera\",\n-\t\t\"classpath\": \"com.gpr.plugins.camera.CameraPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.camera.CameraPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/device\",\n-\t\t\"classpath\": \"com.gpr.plugins.device.DevicePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.device.DevicePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/filesystem\",\n-\t\t\"classpath\": \"com.gpr.plugins.filesystem.FilesystemPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.filesystem.FilesystemPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/haptics\",\n-\t\t\"classpath\": \"com.gpr.plugins.haptics.HapticsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.haptics.HapticsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/keyboard\",\n-\t\t\"classpath\": \"com.gpr.plugins.keyboard.KeyboardPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.keyboard.KeyboardPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/local-notifications\",\n-\t\t\"classpath\": \"com.gpr.plugins.localnotifications.LocalNotificationsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.localnotifications.LocalNotificationsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/network\",\n-\t\t\"classpath\": \"com.gpr.plugins.network.NetworkPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.network.NetworkPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/push-notifications\",\n-\t\t\"classpath\": \"com.gpr.plugins.pushnotifications.PushNotificationsPlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.pushnotifications.PushNotificationsPlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/share\",\n-\t\t\"classpath\": \"com.gpr.plugins.share.SharePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.share.SharePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@capacitor/storage\",\n-\t\t\"classpath\": \"com.gpr.plugins.storage.StoragePlugin\"\n+\t\t\"classpath\": \"com.capacitorjs.plugins.storage.StoragePlugin\"\n \t},\n \t{\n \t\t\"pkg\": \"@sentry/capacitor\",\ndiff --git a/android/build.gradle b/android/build.gradle\nindex ad085c345..8b15a0939 100644\n--- a/android/build.gradle\n+++ b/android/build.gradle\n@@ -1,13 +1,13 @@\n // Top-level build file where you can add configuration options common to all sub-projects/modules.\n \n buildscript {\n- \n+\n repositories {\n google()\n jcenter()\n }\n dependencies {\n- classpath 'com.android.tools.build:gradle:4.2.1'\n+ classpath 'com.android.tools.build:gradle:7.0.4'\n classpath 'com.google.gms:google-services:4.3.5'\n \n // NOTE: Do not place your application dependencies here; they belong\ndiff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties\nindex 3c4101c3e..29e413457 100644\n--- a/android/gradle/wrapper/gradle-wrapper.properties\n+++ b/android/gradle/wrapper/gradle-wrapper.properties\n@@ -1,5 +1,5 @@\n distributionBase=GRADLE_USER_HOME\n distributionPath=wrapper/dists\n-distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0-all.zip\n+distributionUrl=https\\://services.gradle.org/distributions/gradle-7.0.2-all.zip\n zipStoreBase=GRADLE_USER_HOME\n zipStorePath=wrapper/dists\ndiff --git a/package.json b/package.json\nindex 90f3fb61a..e8e4b4e8d 100644\n--- a/package.json\n+++ b/package.json\n@@ -13,7 +13,8 @@\n \"test:prof\": \"ionic build --configuration production && npm run test\",\n \"dev:share\": \"lite-server --baseDir=share\",\n \"install:chromium\": \"node node_modules/puppeteer/install.js\",\n- \"build:version\":\"node ./version/git-version.js\"\n+ \"build:version\": \"node ./version/git-version.js\",\n+ \"ionic-build\": \"ionic cap run android --prod\"\n },\n \"private\": true,\n \"dependencies\": {\ndiff --git a/readme.md b/readme.md\nindex 2b68cd43d..4ac2e2924 100644\n--- a/readme.md\n+++ b/readme.md\n@@ -17,15 +17,11 @@ npm install -g @angular/cli\n npm install -g cordova\n npm install -g cordova-res\n \n-## Mobile first dependencies\n-ionic cordova plugin add cordova-plugin-network-information\n-\n ## memory leak\n set NODE_OPTIONS=--max_old_space_size=99999996\n-\n-npm i cordova-plugin-androidx-adapter\n-npm install jetifier\n-npx jetify\n+npm i cordova-plugin-androidx-adapter --force\n+npm install jetifier --force\n+npx jetify --force\n \n ```\n \n@@ -55,7 +51,7 @@ ionic serve build --prod\n npm run start\n ```\n \n-## Run test[.](#run-test)\n+## Run test\n \n ```bash\n # incase you don't have .env file\n@@ -75,6 +71,14 @@ cp -r ./www ./serve\n npm run dev:share\n ```\n \n+\n+\n+## Tag stable version\n+\n+```bash\n+git tag stable\n+```\n+\n ## Contributing\n \n For major changes, please open an issue first to discuss what you would like to change.\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex 9df0e95ab..50f15c66e 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -7,6 +7,8 @@ export const environment = {\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex 7daab784b..57721f3a5 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -6,8 +6,10 @@ export const environment = {\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n- apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n- apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n+ //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n /* apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\ndiff --git a/txt.txt b/txt.txt\ndeleted file mode 100644\nindex f7c460ef9..000000000\n--- a/txt.txt\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-assets/images/theme/gov/icons-search-close.svg\n-assets/images/icons-most-searched-words-open.svg\n\\ No newline at end of file\ndiff --git a/version/git-version.js b/version/git-version.js\nindex 5591e502e..be29c55b1 100644\n--- a/version/git-version.js\n+++ b/version/git-version.js\n@@ -11,6 +11,8 @@ const commitTime = childProcess.execSync(\"git log -1 --pretty=format:'%cd'\").toS\n const commitMsg = childProcess.execSync(\"git log -1 --pretty=%B\").toString().trim();\n const totalCommitCount = childProcess.execSync(\"git rev-list --count HEAD\").toString().trim();\n const change = childProcess.execSync(`git diff -- \":!/version/git-version.ts\" \":!/version/git-version.json\" `,{cwd: rootDir }).toString().trim();\n+const changeStatus = childProcess.execSync(\"git status\").toString().trim();\n+const changeAuthor = childProcess.execSync(\"whoami\").toString().trim();\n \n const versionInfo = {\n shortSHA: shortSHA,\n@@ -20,7 +22,9 @@ const versionInfo = {\n lastCommitTime: commitTime,\n lastCommitMessage: commitMsg,\n lastCommitNumber: totalCommitCount,\n- change\n+ change,\n+ changeStatus,\n+ changeAuthor,\n }\n \n const versionInfoJson = JSON.stringify(versionInfo, null, 2);",
"changeStatus": "On branch develop_bitOut-fix\nChanges not staged for commit:\n (use \"git add/rm <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: android/app/src/main/assets/capacitor.plugins.json\n\tmodified: android/build.gradle\n\tmodified: android/gradle/wrapper/gradle-wrapper.properties\n\tmodified: package.json\n\tmodified: readme.md\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tdeleted: txt.txt\n\tmodified: version/git-version.js\n\tmodified: version/git-version.json\n\tmodified: version/git-version.ts\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")",
"changeAuthor": "peter.maquiran"
}