Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit b6cf0ae

Browse files
rafaelksrafaelks
authored
Merge pull request #1820 from RocketChat/beta
[RELEASE] Merge BETA into MASTER
2 parents ea6c808 + 644e269 commit b6cf0ae

File tree

117 files changed

+3247
-1376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+3247
-1376
lines changed

‎.circleci/config.yml‎

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
version: 2
2+
build:
3+
machine:
4+
java: oraclejdk8
25
jobs:
36
build-kotlin-sdk:
47
docker:
5-
- image: circleci/android:api-27-alpha
8+
- image: circleci/android:api-28-alpha
69
environment:
7-
JVM_OPTS: -Xmx3200m
10+
JAVA_TOOL_OPTIONS: -Xmx5024m
811
steps:
912
- checkout
1013
- run:
@@ -18,8 +21,9 @@ jobs:
1821
command: pushd app/ ; ./build-sdk.sh ; popd
1922
- save_cache:
2023
paths:
21-
- ~/.gradle
22-
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
24+
- ~/.gradle/caches
25+
- ~/.gradle/wrapper
26+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
2327
- save_cache:
2428
paths:
2529
- app/libs/
@@ -30,47 +34,51 @@ jobs:
3034
destination: libs
3135
code-analysis:
3236
docker:
33-
- image: circleci/android:api-27-alpha
37+
- image: circleci/android:api-28-alpha
3438
environment:
35-
JVM_OPTS: -Xmx3200m
39+
JAVA_TOOL_OPTIONS: -Xmx5024m
3640
steps:
3741
- checkout
3842
- run:
3943
name: ANDROID_HOME
40-
command: echo "sdk.dir="$ANDROID_HOME > local.properties
44+
command: echo "sdk.dir="$ANDROID_HOME > local.properties
4145
- run:
4246
name: checkout Rocket.Chat.Kotlin.SDK
4347
command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
4448
- restore_cache:
4549
key: kotlin-sdk-{{ .Revision }}
4650
- restore_cache:
47-
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
51+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
4852
- run:
4953
name: Download Dependencies
50-
command: ./gradlew androidDependencies --quiet --console=plain
54+
command: ./gradlew --no-daemon androidDependencies --quiet --console=plain
5155
- save_cache:
5256
paths:
53-
- ~/.gradle
54-
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
57+
- ~/.gradle/caches
58+
- ~/.gradle/wrapper
59+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
5560
- run:
5661
name: Run Lint #, Checkstyles, PMD, Findbugs...
57-
command: ./gradlew lint
62+
command: ./gradlew --no-daemon lint
5863
- run:
5964
name: Run Unit test
60-
command: ./gradlew test
65+
command: ./gradlew --no-daemon test
6166
- run:
6267
name: Compile Instrumentation test
63-
command: ./gradlew assembleAndroidTest
68+
command: ./gradlew --no-daemon assembleAndroidTest
6469
- store_artifacts:
6570
path: app/build/reports/
6671
destination: reports
6772
build-play-apk:
6873
docker:
69-
- image: circleci/android:api-27-alpha
74+
- image: circleci/android:api-28-alpha
7075
environment:
71-
JVM_OPTS: -Xmx3200m
76+
JAVA_TOOL_OPTIONS: -Xmx5024m
7277
steps:
7378
- checkout
79+
- run:
80+
name: ANDROID_HOME
81+
command: echo "sdk.dir="$ANDROID_HOME > local.properties
7482
- run:
7583
name: restore files from ENV
7684
command: |
@@ -82,28 +90,32 @@ jobs:
8290
- restore_cache:
8391
key: kotlin-sdk-{{ .Revision }}
8492
- restore_cache:
85-
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
93+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
8694
- run:
8795
name: Download Dependencies
88-
command: ./gradlew androidDependencies --quiet --console=plain
96+
command: ./gradlew --no-daemon androidDependencies --quiet --console=plain
8997
- save_cache:
9098
paths:
91-
- ~/.gradle
92-
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
99+
- ~/.gradle/caches
100+
- ~/.gradle/wrapper
101+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
93102
- run:
94103
name: Build APK
95104
command: |
96-
./gradlew assemblePlayRelease --info --console=plain --stacktrace
105+
./gradlew --no-daemon assemblePlayRelease --info --console=plain --stacktrace
97106
- store_artifacts:
98107
path: app/build/outputs/apk
99108
destination: apks
100109
build-foss-apk:
101110
docker:
102-
- image: circleci/android:api-27-alpha
111+
- image: circleci/android:api-28-alpha
103112
environment:
104-
JVM_OPTS: -Xmx3200m
113+
JAVA_TOOL_OPTIONS: -Xmx5024m
105114
steps:
106115
- checkout
116+
- run:
117+
name: ANDROID_HOME
118+
command: echo "sdk.dir="$ANDROID_HOME > local.properties
107119
- run:
108120
name: restore files from ENV
109121
command: |
@@ -115,18 +127,19 @@ jobs:
115127
- restore_cache:
116128
key: kotlin-sdk-{{ .Revision }}
117129
- restore_cache:
118-
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
130+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
119131
- run:
120132
name: Download Dependencies
121-
command: ./gradlew androidDependencies --quiet --console=plain
133+
command: ./gradlew --no-daemon androidDependencies --quiet --console=plain
122134
- save_cache:
123135
paths:
124-
- ~/.gradle
125-
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
136+
- ~/.gradle/caches
137+
- ~/.gradle/wrapper
138+
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
126139
- run:
127140
name: Build APK
128141
command: |
129-
./gradlew assembleFossRelease --info --console=plain --stacktrace
142+
./gradlew --no-daemon assembleFossRelease --info --console=plain --stacktrace
130143
- store_artifacts:
131144
path: app/build/outputs/apk
132145
destination: apks

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This repository contains all the code related to the Android native application
1111

1212
## How to build
1313

14-
- You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is beeing used on this application.
14+
- You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is being used on this application.
1515
- Make sure that you have the latest **gradle** and the **android plugin** versions installed. Go to `File > Project Structure > Project` and make sure that you have the latest versions installed. Refer [this](https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle) to see the compatible versions.
1616
- Kotlin is already configured in the project. To check, go to `Tools > Kotlin > Configure Kotlin in project`. A message saying kotlin is already configured in the project pops up. You can update kotlin to the latest version by going to `Tools > Kotlin > Configure Kotlin updates` and download the latest version of kotlin.
1717

‎app/build-sdk.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ if ! check_git_dirty && ! check_last_commit && [ -f "${CURRENT_DIR}"/libs/common
9494
exit 0
9595
fi
9696

97-
cd "${SDK_DIR}" && ./gradlew common:assemble && cd "${CURRENT_DIR}"
98-
cd "${SDK_DIR}" && ./gradlew core:assemble && cd "${CURRENT_DIR}"
97+
cd "${SDK_DIR}" && ./gradlew --no-daemon common:assemble && cd "${CURRENT_DIR}"
98+
cd "${SDK_DIR}" && ./gradlew --no-daemon core:assemble && cd "${CURRENT_DIR}"
9999

100100
rm "${CURRENT_DIR}"/libs/common* "${CURRENT_DIR}"/libs/core*
101101

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ android {
1616
applicationId "chat.rocket.android"
1717
minSdkVersion versions.minSdk
1818
targetSdkVersion versions.targetSdk
19-
versionCode 2048
20-
versionName "3.0.0"
19+
versionCode 2049
20+
versionName "3.1.0"
2121
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2222
multiDexEnabled true
2323

0 commit comments

Comments
 (0)