Skip to content

Commit

Permalink
Merge pull request #10023 from nextcloud/stable-3.20-bump
Browse files Browse the repository at this point in the history
Bump versions for 3.20.0 RC1
  • Loading branch information
AlvaroBrey authored Mar 28, 2022
2 parents 4b8bb8a + ea93d93 commit 1a428dc
Show file tree
Hide file tree
Showing 5 changed files with 15 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 @@ -67,7 +67,7 @@ repositories {
def versionMajor = 3
def versionMinor = 20
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 @@ -6,7 +6,7 @@ buildscript {
daggerVersion = "2.41"
markwonVersion = "4.6.2"
prismVersion = "2.0.0"
androidLibraryVersion = "master-SNAPSHOT"
androidLibraryVersion = "rc-2.10.0-01"
mockitoVersion = "4.4.0"
mockitoKotlinVersion = "4.0.0"
mockkVersion = "1.12.3"
Expand Down
10 changes: 10 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/30200051.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## 3.20.0 RC1 (March 28, 2022)

- Built-in PDF viewer
- Built-in document scanner
- Better choices for storage permissions
- Many bugfixes and improvements

Minimum: NC 16 Server, Android 6.0 Marshmallow

For a full list, please see /~https://github.com/nextcloud/android/milestone/64
2 changes: 1 addition & 1 deletion scripts/analysis/analysis-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#6: DRONE_BUILD_NUMBER
#7: PULL_REQUEST_NUMBER

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

ruby scripts/analysis/lint-up.rb $1 $2 $3
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.20";
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.20"' | cut -d"\"" -f4
fi

0 comments on commit 1a428dc

Please sign in to comment.