Skip to content

Commit 1a428dc

Browse files
authored
Merge pull request #10023 from nextcloud/stable-3.20-bump
Bump versions for 3.20.0 RC1
2 parents 4b8bb8a + ea93d93 commit 1a428dc

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ repositories {
6767
def versionMajor = 3
6868
def versionMinor = 20
6969
def versionPatch = 0
70-
def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable
70+
def versionBuild = 51 // 0-50=Alpha / 51-98=RC / 90-99=stable
7171

7272

7373
def ndkEnv = new HashMap<String, String>()

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
daggerVersion = "2.41"
77
markwonVersion = "4.6.2"
88
prismVersion = "2.0.0"
9-
androidLibraryVersion = "master-SNAPSHOT"
9+
androidLibraryVersion = "rc-2.10.0-01"
1010
mockitoVersion = "4.4.0"
1111
mockitoKotlinVersion = "4.0.0"
1212
mockkVersion = "1.12.3"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## 3.20.0 RC1 (March 28, 2022)
2+
3+
- Built-in PDF viewer
4+
- Built-in document scanner
5+
- Better choices for storage permissions
6+
- Many bugfixes and improvements
7+
8+
Minimum: NC 16 Server, Android 6.0 Marshmallow
9+
10+
For a full list, please see https://github.com/nextcloud/android/milestone/64

scripts/analysis/analysis-wrapper.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#6: DRONE_BUILD_NUMBER
99
#7: PULL_REQUEST_NUMBER
1010

11-
stableBranch="master"
11+
stableBranch="stable-3.20"
1212
repository="android"
1313

1414
ruby scripts/analysis/lint-up.rb $1 $2 $3

scripts/analysis/getBranchName.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# $1: username, $2: password/token, $3: pull request number
44

55
if [ -z $3 ] ; then
6-
echo "master";
6+
echo "stable-3.20";
77
else
8-
curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android/pulls/$3 | grep \"ref\": | grep -v '"master"' | cut -d"\"" -f4
8+
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
99
fi

0 commit comments

Comments
 (0)