From 5fdc0039966ad98fa935e2bf3626ea404381a09e Mon Sep 17 00:00:00 2001
From: Benjamin Halko <benjaminhalko@hotmail.com>
Date: Sun, 31 Dec 2023 08:44:24 -0800
Subject: [PATCH] fix: updated

---
 .github/workflows/release-build.yml | 14 +++++++----
 package-lock.json                   | 39 -----------------------------
 package.json                        |  1 -
 3 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index bba19cca88..5181b4ac49 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -26,15 +26,19 @@ jobs:
       - name: Bump version code
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          npx semantic-release --extends ./.releaserc.bump.json --dry-run --no-ci
+        run: npx semantic-release --extends ./.releaserc.bump.json --no-ci --dry-run
+
+      - name: Set env
+        run: echo "RELEASE_VERSION=$(cat .VERSION)" >> $GITHUB_ENV
 
-      - name: Get version code
+      - name: Bump pubspec version
         run: |
-          echo "RELEASE_VERSION=v$(cat .VERSION)" >> $GITHUB_ENV
+          IFS='.' read -r -a nums <<< "${RELEASE_VERSION/-dev/}.0"
+          VERSIONCODE=$((nums[0] * 100000000 + nums[1] * 100000 + nums[2] * 100 + nums[3]))
+          sed -i "/^version/c\\version: ${{ env.RELEASE_VERSION }}+$VERSIONCODE" pubspec.yaml
 
       - name: Rename APK
-        run: mv build/app/outputs/apk/release/app-release.apk revanced-manager-${{ env.RELEASE_VERSION }}.apk
+        run: mv build/app/outputs/apk/release/app-release.apk revanced-manager-v${{ env.RELEASE_VERSION }}.apk
       
       - name: Publish release APK
         env:
diff --git a/package-lock.json b/package-lock.json
index 73276282f1..814a42e740 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
   "packages": {
     "": {
       "devDependencies": {
-        "@droidsolutions-oss/semantic-release-update-file": "^1.3.2",
         "@saithodev/semantic-release-backmerge": "^4.0.1",
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/exec": "^6.0.3",
@@ -201,19 +200,6 @@
         "node": ">=0.1.90"
       }
     },
-    "node_modules/@droidsolutions-oss/semantic-release-update-file": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@droidsolutions-oss/semantic-release-update-file/-/semantic-release-update-file-1.3.2.tgz",
-      "integrity": "sha512-ahV0OWiEUf20e7lLH3gnBLF1SfRNPN99MeaLVaFX6jT3DegTLzkVPeY2CZWa+K4tAXBALc29Bq/kzjv8PAXFGw==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.1.0",
-        "lodash.template": "^4.5.0"
-      },
-      "engines": {
-        "node": ">= 14.0.0"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2238,12 +2224,6 @@
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
       "dev": true
     },
-    "node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
-      "dev": true
-    },
     "node_modules/lodash.capitalize": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz",
@@ -2268,25 +2248,6 @@
       "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
       "dev": true
     },
-    "node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
     "node_modules/lodash.uniqby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
diff --git a/package.json b/package.json
index fda4a9f6b8..9702cb2f8a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,5 @@
 {
   "devDependencies": {
-    "@droidsolutions-oss/semantic-release-update-file": "^1.3.2",
     "@saithodev/semantic-release-backmerge": "^4.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^6.0.3",