Skip to content

A
AloqaIM-Android
Commit 138c51ba authored by Leonardo Aramaki's avatar Leonardo Aramaki
Browse files
Options

Fixes for the build process

parent 4c183027
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 33 deletions
.circleci/config.yml
View file @ 138c51ba
...@@ -5,9 +5,9 @@ build: ...@@ -5,9 +5,9 @@ build:
jobs: jobs:
build-kotlin-sdk: build-kotlin-sdk:
docker: docker:
- image: circleci/android:api-27-alpha - image: circleci/android:api-28-alpha
environment: environment:
JAVA_TOOL_OPTIONS: -Xmx3200m JAVA_TOOL_OPTIONS: -Xmx5024m
steps: steps:
- checkout - checkout
- run: - run:
...@@ -21,8 +21,9 @@ jobs: ...@@ -21,8 +21,9 @@ jobs:
command: pushd app/ ; ./build-sdk.sh ; popd command: pushd app/ ; ./build-sdk.sh ; popd
- save_cache: - save_cache:
paths: paths:
- ~/.gradle - ~/.gradle/caches
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }} - ~/.gradle/wrapper
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" }}
- save_cache: - save_cache:
paths: paths:
- app/libs/ - app/libs/
...@@ -33,31 +34,29 @@ jobs: ...@@ -33,31 +34,29 @@ jobs:
destination: libs destination: libs
code-analysis: code-analysis:
docker: docker:
- image: circleci/android:api-27-alpha - image: circleci/android:api-28-alpha
environment: environment:
JVM_OPTS: -Xmx3200m JAVA_TOOL_OPTIONS: -Xmx5024m
steps: steps:
- checkout - checkout
- run: - run:
name: ANDROID_HOME name: ANDROID_HOME
command: echo "sdk.dir="$ANDROID_HOME > local.properties command: echo "sdk.dir="$ANDROID_HOME > local.properties
- run:
name: Accept licenses
command: echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --filter build-tools-28.0.3,android-28
- run: - run:
name: checkout Rocket.Chat.Kotlin.SDK name: checkout Rocket.Chat.Kotlin.SDK
command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
- restore_cache: - restore_cache:
key: kotlin-sdk-{{ .Revision }} key: kotlin-sdk-{{ .Revision }}
- restore_cache: - restore_cache:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }} 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" }}
- run: - run:
name: Download Dependencies name: Download Dependencies
command: ./gradlew androidDependencies --quiet --console=plain command: ./gradlew androidDependencies --quiet --console=plain
- save_cache: - save_cache:
paths: paths:
- ~/.gradle - ~/.gradle/caches
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }} - ~/.gradle/wrapper
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" }}
- run: - run:
name: Run Lint #, Checkstyles, PMD, Findbugs... name: Run Lint #, Checkstyles, PMD, Findbugs...
command: ./gradlew lint command: ./gradlew lint
...@@ -74,15 +73,12 @@ jobs: ...@@ -74,15 +73,12 @@ jobs:
docker: docker:
- image: circleci/android:api-28-alpha - image: circleci/android:api-28-alpha
environment: environment:
JVM_OPTS: -Xmx3200m JAVA_TOOL_OPTIONS: -Xmx5024m
steps: steps:
- checkout - checkout
- run: - run:
name: ANDROID_HOME name: ANDROID_HOME
command: echo "sdk.dir="$ANDROID_HOME > local.properties command: echo "sdk.dir="$ANDROID_HOME > local.properties
- run:
name: Accept licenses
command: echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --filter build-tools-28.0.3,android-28
- run: - run:
name: restore files from ENV name: restore files from ENV
command: | command: |
...@@ -94,14 +90,15 @@ jobs: ...@@ -94,14 +90,15 @@ jobs:
- restore_cache: - restore_cache:
key: kotlin-sdk-{{ .Revision }} key: kotlin-sdk-{{ .Revision }}
- restore_cache: - restore_cache:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }} 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" }}
- run: - run:
name: Download Dependencies name: Download Dependencies
command: ./gradlew androidDependencies --quiet --console=plain command: ./gradlew androidDependencies --quiet --console=plain
- save_cache: - save_cache:
paths: paths:
- ~/.gradle - ~/.gradle/caches
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }} - ~/.gradle/wrapper
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" }}
- run: - run:
name: Build APK name: Build APK
command: | command: |
...@@ -111,17 +108,14 @@ jobs: ...@@ -111,17 +108,14 @@ jobs:
destination: apks destination: apks
build-foss-apk: build-foss-apk:
docker: docker:
- image: circleci/android:api-27-alpha - image: circleci/android:api-28-alpha
environment: environment:
JVM_OPTS: -Xmx3200m JAVA_TOOL_OPTIONS: -Xmx5024m
steps: steps:
- checkout - checkout
- run: - run:
name: ANDROID_HOME name: ANDROID_HOME
command: echo "sdk.dir="$ANDROID_HOME > local.properties command: echo "sdk.dir="$ANDROID_HOME > local.properties
- run:
name: Accept licenses
command: echo y | $ANDROID_HOME/tools/android update sdk --no-ui --all --filter build-tools-28.0.3,android-28
- run: - run:
name: restore files from ENV name: restore files from ENV
command: | command: |
...@@ -133,14 +127,15 @@ jobs: ...@@ -133,14 +127,15 @@ jobs:
- restore_cache: - restore_cache:
key: kotlin-sdk-{{ .Revision }} key: kotlin-sdk-{{ .Revision }}
- restore_cache: - restore_cache:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }} 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" }}
- run: - run:
name: Download Dependencies name: Download Dependencies
command: ./gradlew androidDependencies --quiet --console=plain command: ./gradlew androidDependencies --quiet --console=plain
- save_cache: - save_cache:
paths: paths:
- ~/.gradle - ~/.gradle/caches
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }} - ~/.gradle/wrapper
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" }}
- run: - run:
name: Build APK name: Build APK
command: | command: |
......
build.gradle
View file @ 138c51ba
...@@ -10,16 +10,13 @@ buildscript { ...@@ -10,16 +10,13 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.0-alpha02' classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
classpath 'com.google.gms:google-services:4.0.2' classpath 'com.google.gms:google-services:4.1.0'
classpath 'io.fabric.tools:gradle:1.25.4' classpath 'io.fabric.tools:gradle:1.25.4'
classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0" classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
} }
} }
......
dependencies.gradle
View file @ 138c51ba
...@@ -9,7 +9,7 @@ ext { ...@@ -9,7 +9,7 @@ ext {
dokka : '0.9.16', dokka : '0.9.16',
// For app // For app
kotlin : '1.2.61', kotlin : '1.2.71',
coroutine : '0.25.0', coroutine : '0.25.0',
appCompat : '1.0.0', appCompat : '1.0.0',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023