Skip to content

Commit

Permalink
Merge pull request #11930 from nextcloud/bump3.26
Browse files Browse the repository at this point in the history
Bump3.26
  • Loading branch information
tobiasKaminsky authored Aug 31, 2023
2 parents 9ea82ed + 0a036de commit bbba3fe
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ configurations.configureEach {
def versionMajor = 3
def versionMinor = 26
def versionPatch = 0
def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable
def versionBuild = 51 // 0-50=Alpha / 51-98=RC / 90-99=stable


def ndkEnv = new HashMap<String, String>()
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
daggerVersion = "2.47"
markwonVersion = "4.6.2"
prismVersion = "2.0.0"
androidLibraryVersion = "master-SNAPSHOT"
androidLibraryVersion = "rc-2.16.0-01"
mockitoVersion = "4.11.0"
mockitoKotlinVersion = "4.1.0"
mockkVersion = "1.13.3"
Expand Down
2 changes: 1 addition & 1 deletion scripts/analysis/analysis-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BUILD_NUMBER=$4
PR_NUMBER=$5


stableBranch="master"
stableBranch="stable-3.26"
repository="android"

ruby scripts/analysis/lint-up.rb
Expand Down
4 changes: 2 additions & 2 deletions scripts/analysis/getBranchName.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# $1: username, $2: password/token, $3: pull request number

if [ -z $3 ] ; then
echo "master";
echo "stable-3.26";
else
curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android/pulls/$3 | grep \"ref\": | grep -v '"master"' | cut -d"\"" -f4
curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android/pulls/$3 | grep \"ref\": | grep -v '"stable-3.26"' | cut -d"\"" -f4
fi

0 comments on commit bbba3fe

Please sign in to comment.