diff --git a/scripts/analysis/detectWrongSettings.sh b/scripts/analysis/detectWrongSettings.sh index 01227dde25..71d7b72c2d 100755 --- a/scripts/analysis/detectWrongSettings.sh +++ b/scripts/analysis/detectWrongSettings.sh @@ -4,9 +4,12 @@ # SPDX-FileCopyrightText: 2016 Tobias Kaminsky # SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only -snapshotCount=$(./gradlew dependencies | grep SNAPSHOT -c) -betaCount=$(grep "true" app/src/main/res/values/setup.xml -c) -libraryHash=$(grep androidLibraryVersion libs.versions.toml | cut -d= -f2 | tr -d \") +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PROJECT_ROOT="$SCRIPT_DIR/../../" + +snapshotCount=$("$PROJECT_ROOT/gradlew" -p "$PROJECT_ROOT" dependencies | grep SNAPSHOT -c) +betaCount=$(grep "true" "$PROJECT_ROOT/app/src/main/res/values/setup.xml" -c) +libraryHash=$(grep androidLibraryVersion "$PROJECT_ROOT/gradle/libs.versions.toml" | cut -d= -f2 | tr -d \"") lastHashes=$(curl "https://api.github.com/repos/nextcloud/android-library/commits?sha=$baseBranch" | jq ".[] .sha" | head -n 20) baseBranch="master" diff --git a/scripts/buildDev b/scripts/buildDev index 9299f82e86..dac352abd2 100755 --- a/scripts/buildDev +++ b/scripts/buildDev @@ -5,7 +5,10 @@ # SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only # date=$(date +%Y%m%d) -oldLibraryCommit=$(grep "androidLibraryVersion\ =" gradle/libs.versions.toml) +SCRIPT_DIR="$(cd "$(dirname \"${BASH_SOURCE[0]}\")" && pwd)" +PROJECT_ROOT="$SCRIPT_DIR/../../" + +oldLibraryCommit=$(grep "androidLibraryVersion\ =" "$PROJECT_ROOT/gradle/libs.versions.toml") libraryCommit=$(curl https://api.github.com/repos/nextcloud/android-library/commits/master | jq .sha | sed s'/\"//g') # use current date for version code/name @@ -13,8 +16,8 @@ sed -i "/versionDev/,/\}/ s/versionCode .*/versionCode $date/" app/build.gradle sed -i "/versionDev/,/\}/ s/versionName .*/versionName \"$date\"/" app/build.gradle # change library -sed -i s"#androidLibraryVersion\ =.*#androidLibraryVersion =\"$libraryCommit\"#" gradle/libs.versions.toml -./gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help +sed -i s"#androidLibraryVersion\ =.*#androidLibraryVersion =\"$libraryCommit\"#" "$PROJECT_ROOT/gradle/libs.versions.toml" +"$PROJECT_ROOT/gradlew" --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help # build signed apk source ndk.env diff --git a/scripts/updateLibraryHash.sh b/scripts/updateLibraryHash.sh index f6cee320f9..8b63e06baf 100755 --- a/scripts/updateLibraryHash.sh +++ b/scripts/updateLibraryHash.sh @@ -9,15 +9,18 @@ git checkout master git pull latestCommit=$(curl -s https://api.github.com/repos/nextcloud/android-library/commits/master | jq .sha | sed s'/\"//g') -currentCommit=$(grep "androidLibraryVersion" gradle/libs.versions.toml | cut -f2 -d'"') +SCRIPT_DIR="$(cd "$(dirname \"${BASH_SOURCE[0]}\")" && pwd)" +PROJECT_ROOT="$SCRIPT_DIR/../../" + +currentCommit=$(grep "androidLibraryVersion" "$PROJECT_ROOT/gradle/libs.versions.toml" | cut -f2 -d'"') [[ $latestCommit == "$currentCommit" ]] && echo "Nothing to do. Commit is: $latestCommit" && exit # nothing to do git fetch git checkout -B update-library-"$(date +%F)" origin/master -sed -i s"#androidLibraryVersion\ =.*#androidLibraryVersion =\"$latestCommit\"#" gradle/libs.versions.toml -./gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help +sed -i s"#androidLibraryVersion\ =.*#androidLibraryVersion =\"$latestCommit\"#" "$PROJECT_ROOT/gradle/libs.versions.toml" +"$PROJECT_ROOT/gradlew" --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help git add build.gradle git add gradle/verification-metadata.xml