diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5fab39edd4..91f24b9f4c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -161,7 +161,7 @@ If automatic backport fails, it will create a comment. For speeding up developing, we do use a master snapshot of nextcloud-library, provided by jitpack.io. This means that if a breaking change is merged on library, master branch of the app will fail. To limit this risk please follow this approach: -- on app PR: first use a reference to your library branch in build.gradle: ext -> androidLibraryVersion, e.g. androidLibraryVersion = "changeSearch-SNAPSHOT" +- on app PR: first use a reference to your library branch in gradle/libs.versions.toml: ext -> androidLibraryVersion, e.g. androidLibraryVersion = "changeSearch-SNAPSHOT" - on library PR: use label "client change required" to indicate that this is breaking change. This will prevent GitHub from merging it. Once both PRs are reviewed and ready to merge: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 8e76554947..ceebfb28d7 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -261,12 +261,12 @@ end desc "check if library is set correctly" private_lane :checkLibrary_RC do - sh(" if [ $(egrep 'androidLibraryVersion.*master.*' ../build.gradle -c) -eq 1 ] ; then echo 'Library is set to master tag; aborting!' ; exit 1 ; fi") + sh(" if [ $(egrep 'androidLibraryVersion.*master.*' ../gradle/libs.versions.toml -c) -eq 1 ] ; then echo 'Library is set to master tag; aborting!' ; exit 1 ; fi") end desc "check if library is set correctly: must NOT contain master nor rc" private_lane :checkLibrary_Final do - sh(" if [ $(grep 'androidLibraryVersion' ../build.gradle | egrep 'master|rc' -c) -eq 1 ] ; then echo 'Library is still set to rc tag; aborting!' ; exit 1 ; fi") + sh(" if [ $(grep 'androidLibraryVersion' ../gradle/libs.versions.toml | egrep 'master|rc' -c) -eq 1 ] ; then echo 'Library is still set to rc tag; aborting!' ; exit 1 ; fi") end desc "check if screenshots exists and exit" diff --git a/scripts/analysis/detectWrongSettings.sh b/scripts/analysis/detectWrongSettings.sh index e563585425..9dbef608cf 100755 --- a/scripts/analysis/detectWrongSettings.sh +++ b/scripts/analysis/detectWrongSettings.sh @@ -6,7 +6,7 @@ snapshotCount=$(./gradlew dependencies | grep SNAPSHOT -c) betaCount=$(grep "true" app/src/main/res/values/setup.xml -c) -libraryHash=$(grep androidLibraryVersion build.gradle | cut -d= -f2 | tr -d \") +libraryHash=$(grep androidLibraryVersion 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 d82d26848a..9299f82e86 100755 --- a/scripts/buildDev +++ b/scripts/buildDev @@ -5,7 +5,7 @@ # SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only # date=$(date +%Y%m%d) -oldLibraryCommit=$(grep "androidLibraryVersion\ =" build.gradle) +oldLibraryCommit=$(grep "androidLibraryVersion\ =" 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,7 +13,7 @@ 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\"#" build.gradle +sed -i s"#androidLibraryVersion\ =.*#androidLibraryVersion =\"$libraryCommit\"#" gradle/libs.versions.toml ./gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help # build signed apk diff --git a/scripts/updateLibraryHash.sh b/scripts/updateLibraryHash.sh index 7500b834f5..f6cee320f9 100755 --- a/scripts/updateLibraryHash.sh +++ b/scripts/updateLibraryHash.sh @@ -9,14 +9,14 @@ 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" build.gradle | cut -f2 -d'"') +currentCommit=$(grep "androidLibraryVersion" 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\"#" build.gradle +sed -i s"#androidLibraryVersion\ =.*#androidLibraryVersion =\"$latestCommit\"#" gradle/libs.versions.toml ./gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help git add build.gradle