main branch updated

scripts/analysis/detectWrongSettings.sh

@@ -6,12 +6,20 @@
 
 snapshotCount=$(./gradlew dependencies | grep SNAPSHOT -c)
 betaCount=$(grep "<bool name=\"is_beta\">true</bool>" app/src/main/res/values/setup.xml -c)
-libraryHash=$(grep androidLibraryVersion build.gradle | cut -d= -f2 | tr -d \")
+
+# Read androidLibraryVersion from TOML
+libraryHash=$(grep 'androidLibraryVersion' gradle/libs.versions.toml \
+    | cut -d '=' -f2 \
+    | tr -d ' "' )
 
 baseBranch="master"
-lastHashes=$(curl "https://api.github.com/repos/nextcloud/android-library/commits?sha=$baseBranch" | jq ".[] .sha" | head -n 20)
 
-if [[ $(echo "$lastHashes"  | grep -c $libraryHash) -ne 1  ]]; then
+# Fetch last 10 commit SHAs from GitHub, without quotes
+lastHashes=$(curl -s "https://api.github.com/repos/nextcloud/android-library/commits?sha=$baseBranch" \
+    | jq -r '.[].sha' | head -n 10)
+
+# Check if libraryHash is in lastHashes
+if ! echo "$lastHashes" | grep -q "^$libraryHash$"; then
     echo "Library commit not within last 10 hashes, please rebase!"
     exit 1
 fi
@@ -20,10 +28,10 @@ if [[ $snapshotCount -gt 0 ]] ; then
     echo "Snapshot found in dependencies"
     exit 1
 fi
+
 if [[ $betaCount -gt 0 ]] ; then
     echo "Beta is set in setup.xml"
     exit 1
 fi
- 
-exit 0
 
+exit 0