From 1e2546380336224d58d02c4c63838d2f9788c568 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Mon, 6 May 2024 15:26:07 +0800
Subject: [PATCH] Waistline: fix build

---
 metadata/com.waist.line.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/metadata/com.waist.line.yml b/metadata/com.waist.line.yml
index e8e81a4c67..219ba0cb45 100644
--- a/metadata/com.waist.line.yml
+++ b/metadata/com.waist.line.yml
@@ -769,11 +769,9 @@ Builds:
     versionCode: 30800
     commit: 2e4c0a6354708e9712bbd0a09f5907df957f0a23
     sudo:
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.18.0/node-v16.18.0-linux-x64.tar.gz
-      - echo "faca6476cb5b41aa995370fd856d16fcfbbef5c18718a6fa44cc1bae4140849d node.tar.gz"
-        | sha256sum -c -
-      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
       - sysctl fs.inotify.max_user_watches=524288
+      - apt-get update
+      - apt-get install -y npm
       - npm install -g cordova
     output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk
     srclibs:
@@ -782,22 +780,23 @@ Builds:
       - sdkmanager 'platforms;android-33' 'build-tools;33.0.2'
       - npm install
       - cordova platform add android
+      - cd $$BarcodeScanner$$
+      - rm -r local.properties gradle
+      - sed -i -e 's/3.0.1/7.2.0/' build.gradle
+      - sed -i -e 's/compile /implementation /g' barcodescanner/build.gradle
+      - gradle clean
     scandelete:
       - node_modules
       - platforms
       - plugins
     build:
       - pushd $$BarcodeScanner$$
-      - rm -r local.properties gradle
-      - sed -i -e 's/3.0.1/3.6.4/' build.gradle
-      - gradle clean assembleRelease
+      - gradle assembleRelease
       - popd
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        platforms/android/app/libs/barcodescanner-release-2.1.5.aar
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        plugins/phonegap-plugin-barcodescanner/src/android/barcodescanner-release-2.1.5.aar
-      - cp $$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
-        node_modules/phonegap-plugin-barcodescanner/src/android/barcodescanner-release-2.1.5.aar
+      - AAR=$$BarcodeScanner$$/barcodescanner/build/outputs/aar/barcodescanner-release.aar
+      - cp $AAR platforms/android/app/libs/barcodescanner-release-2.1.5.aar
+      - cp $AAR plugins/phonegap-plugin-barcodescanner/src/android/barcodescanner-release-2.1.5.aar
+      - cp $AAR node_modules/phonegap-plugin-barcodescanner/src/android/barcodescanner-release-2.1.5.aar
       - cordova build android --release -- --packageType=apk
 
 AutoUpdateMode: Version