change scripts for new version of gradle_witness

Author: zoff99

.github/workflows/android.yml

@@ -99,17 +99,9 @@ jobs:
       run: |
         git diff || echo "NO ERR"
 
-    - name: show witness checksums updates
-      if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
-      run: cd android-refimpl-app ; ./gradlew -q calculateChecksums 2>/dev/null
-
     - name: update witness checksums for pull requests
       if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
-      run: cd android-refimpl-app ; ./gradlew -q calculateChecksums 2>/dev/null| grep -v 'Checking the license for' > app/witness.gradle 2>/dev/null
-
-    - name: show witness checksums updates for pull requests
-      if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
-      run: cd android-refimpl-app ; git diff app/witness.gradle
+      run: cd android-refimpl-app ; ./gradlew -q calculateChecksums
 
     - name: Build with Gradle
       run: cd android-refimpl-app ; ./gradlew assemble ; find . -name '*.apk'
@@ -157,7 +149,6 @@ jobs:
         echo "========= git diff before witness update  "========= "
         cd android-refimpl-app/
         ./gradlew -q calculateChecksums
-        ./gradlew -q calculateChecksums 2>/dev/null| grep -v 'Checking the license for' > app/witness.gradle 2>/dev/null
         echo "========= git diff AFTER witness update  "========= "
         cd ../
         git status

tools/check_android_jdbc.sh

@@ -38,11 +38,4 @@ echo "__VERSIONUPDATE__:""$ver"
 
 sed -i -e 's#implementation '"'"'com.github.zoff99:pkgs_zoffccAndroidJDBC:.*#implementation '"'"'com.github.zoff99:pkgs_zoffccAndroidJDBC:'"$ver"''"'"'#' "$f1"
 
-./gradlew -q calculateChecksums >/dev/null 2>/dev/null # first run add some checking for license text. silly crap!
-
-./gradlew -q calculateChecksums | \
-grep -v 'and:sdk:platforms:android.jar' | \
-grep -v 'android:sdk:platforms:android.jar' | \
-grep -v 'android:sdk:platforms:core-for-system-modules.jar' | \
-grep -v '^\(Skipping\|Verifying\|Welcome to Gradle\)' \
-> ./app/witness.gradle
+./gradlew -q calculateChecksums

tools/check_iocipher_jni.sh

@@ -38,11 +38,4 @@ echo "__VERSIONUPDATE__:""$ver"
 
 sed -i -e 's#implementation('"'"'com.github.zoff99:pkgs_guardianprojectIOCipher:.*#implementation('"'"'com.github.zoff99:pkgs_guardianprojectIOCipher:'"$ver"''"'"') {#' "$f1"
 
-./gradlew -q calculateChecksums >/dev/null 2>/dev/null # first run add some checking for license text. silly crap!
-
-./gradlew -q calculateChecksums | \
-grep -v 'and:sdk:platforms:android.jar' | \
-grep -v 'android:sdk:platforms:android.jar' | \
-grep -v 'android:sdk:platforms:core-for-system-modules.jar' | \
-grep -v '^\(Skipping\|Verifying\|Welcome to Gradle\)' \
-> ./app/witness.gradle
+./gradlew -q calculateChecksums

tools/check_toxcore_jni.sh

@@ -38,11 +38,4 @@ echo "__VERSIONUPDATE__:""$ver"
 
 sed -i -e 's#implementation '"'"'com.github.zoff99:pkgs_ToxAndroidRefImpl:.*#implementation '"'"'com.github.zoff99:pkgs_ToxAndroidRefImpl:'"$ver"''"'"'#' "$f1"
 
-./gradlew -q calculateChecksums >/dev/null 2>/dev/null # first run add some checking for license text. silly crap!
-
-./gradlew -q calculateChecksums | \
-grep -v 'and:sdk:platforms:android.jar' | \
-grep -v 'android:sdk:platforms:android.jar' | \
-grep -v 'android:sdk:platforms:core-for-system-modules.jar' | \
-grep -v '^\(Skipping\|Verifying\|Welcome to Gradle\)' \
-> ./app/witness.gradle
+./gradlew -q calculateChecksums