mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 05:35:39 +03:00
Merge pull request #12479 from nextcloud/chore/noid/androidLibraryCommit
Use commit instead of SNAPSHOT for library version due to dependency …
This commit is contained in:
commit
4cff967753
3 changed files with 10 additions and 14 deletions
|
@ -8,7 +8,7 @@ buildscript {
|
|||
daggerVersion = "2.50"
|
||||
markwonVersion = "4.6.2"
|
||||
prismVersion = "2.0.0"
|
||||
androidLibraryVersion = "master-SNAPSHOT"
|
||||
androidLibraryVersion = "008d82ae1c"
|
||||
mockitoVersion = "4.11.0"
|
||||
mockitoKotlinVersion = "4.1.0"
|
||||
mockkVersion = "1.13.9"
|
||||
|
|
|
@ -3012,6 +3012,14 @@
|
|||
<sha256 value="6a91a2139a3cae8126c509cf65d136d49c35cb032b581ac1a56cb6a649cc0245" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.github.nextcloud" name="android-library" version="008d82ae1c">
|
||||
<artifact name="android-library-008d82ae1c.aar">
|
||||
<sha256 value="bdc44e874f1e14338213ae5723e71710940a31416ff1c52c9eb2f282e5d3f29a" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
<artifact name="android-library-008d82ae1c.module">
|
||||
<sha256 value="f28a1132b6a425d00bca507cadc1520d8f6805893a99feec8eb2b3228416dea1" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.github.nextcloud-deps" name="qrcodescanner" version="0.1.2.4">
|
||||
<artifact name="qrcodescanner-0.1.2.4.aar">
|
||||
<sha256 value="b286128792cc04f59b0defa2c937c86d9e2fc824a8011b9af9eea7fd0ea84303" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
|
|
|
@ -53,18 +53,6 @@ else
|
|||
curl_gh -X DELETE "https://api.github.com/repos/nextcloud/$repository/issues/comments/$comment"
|
||||
done
|
||||
|
||||
# check library, only if base branch is master
|
||||
baseBranch=$(scripts/analysis/getBranchBase.sh "${PR_NUMBER}" | tr -d "\"")
|
||||
if [ $baseBranch = "master" -a $(grep "androidLibraryVersion = \"master-SNAPSHOT\"" build.gradle -c) -ne 1 ]; then
|
||||
checkLibraryMessage="<h1>Android-library is not set to master branch in build.gradle</h1>"
|
||||
checkLibrary=1
|
||||
elif [ $baseBranch != "master" -a $baseBranch = $stableBranch -a $(grep "androidLibraryVersion.*SNAPSHOT" build.gradle -c) -ne 0 ]; then
|
||||
checkLibraryMessage="<h1>Android-library is set to a SNAPSHOT in build.gradle</h1>"
|
||||
checkLibrary=1
|
||||
else
|
||||
checkLibrary=0
|
||||
fi
|
||||
|
||||
# lint and spotbugs file must exist
|
||||
if [ ! -s app/build/reports/lint/lint.html ] ; then
|
||||
echo "lint.html file is missing!"
|
||||
|
@ -131,7 +119,7 @@ else
|
|||
notNull="org.jetbrains.annotations.* is used. Please use androidx.annotation.* instead.<br><br>"
|
||||
fi
|
||||
|
||||
bodyContent="$codacyResult $lintResult $spotbugsResult $checkLibraryMessage $lintMessage $spotbugsMessage $gplayLimitation $notNull"
|
||||
bodyContent="$codacyResult $lintResult $spotbugsResult $lintMessage $spotbugsMessage $gplayLimitation $notNull"
|
||||
echo "$bodyContent" >> "$GITHUB_STEP_SUMMARY"
|
||||
payload="{ \"body\" : \"$bodyContent\" }"
|
||||
curl_gh -X POST "https://api.github.com/repos/nextcloud/$repository/issues/${PR_NUMBER}/comments" -d "$payload"
|
||||
|
|
Loading…
Reference in a new issue