Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/0.9.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
bmarty committed May 20, 2020
2 parents 0185e56 + 3ac4998 commit 84a1e49
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
Changes in Riot 0.9.11 (2020-XX-XX)
Changes in Riot 0.9.12 (2020-05-20)
===================================================

MatrixSdk 🚀:
- Upgrade MatrixSdk to version 0.9.35.
- Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.9.35

Changes in Riot 0.9.11 (2020-05-13)
===================================================

MatrixSdk 🚀:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ buildscript {

// global properties used in sub modules
ext {
versionCodeProp = 90911
versionNameProp = "0.9.11"
versionCodeProp = 90912
versionNameProp = "0.9.12"
versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
buildNumberProp = "${versionBuild}"
}
Expand Down
2 changes: 1 addition & 1 deletion vector/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ dependencies {
/************* Matrix SDK management **************/
// update settings.gradle
// use the matrix SDK as external dependency
implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.34'
implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.35'
// use the matrix SDK as a sub project
// you have to uncomment some lines in settings.gradle
//implementation project(':matrix-sdk')
Expand Down

0 comments on commit 84a1e49

Please sign in to comment.