Skip to content

A
AloqaIM-Android
Unverified Commit 7d27e753 authored by Leonardo Aramaki's avatar Leonardo Aramaki Committed by GitHub
Browse files
Options

Merge branch 'develop' into add-permalink

parents 8a1e6710 72d925f8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 39 deletions
.circleci/config.yml
View file @ 7d27e753
version: 2 version: 2
build:
machine:
java: oraclejdk8
jobs: jobs:
build-kotlin-sdk: build-kotlin-sdk:
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:
...@@ -18,8 +21,9 @@ jobs: ...@@ -18,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/
...@@ -30,9 +34,9 @@ jobs: ...@@ -30,9 +34,9 @@ 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:
...@@ -44,33 +48,37 @@ jobs: ...@@ -44,33 +48,37 @@ 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 --no-daemon 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 --no-daemon lint
- run: - run:
name: Run Unit test name: Run Unit test
command: ./gradlew test command: ./gradlew --no-daemon test
- run: - run:
name: Compile Instrumentation test name: Compile Instrumentation test
command: ./gradlew assembleAndroidTest command: ./gradlew --no-daemon assembleAndroidTest
- store_artifacts: - store_artifacts:
path: app/build/reports/ path: app/build/reports/
destination: reports destination: reports
build-play-apk: build-play-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:
name: ANDROID_HOME
command: echo "sdk.dir="$ANDROID_HOME > local.properties
- run: - run:
name: restore files from ENV name: restore files from ENV
command: | command: |
...@@ -82,28 +90,32 @@ jobs: ...@@ -82,28 +90,32 @@ 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 --no-daemon 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: |
./gradlew assemblePlayRelease --info --console=plain --stacktrace ./gradlew --no-daemon assemblePlayRelease --info --console=plain --stacktrace
- store_artifacts: - store_artifacts:
path: app/build/outputs/apk path: app/build/outputs/apk
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:
name: ANDROID_HOME
command: echo "sdk.dir="$ANDROID_HOME > local.properties
- run: - run:
name: restore files from ENV name: restore files from ENV
command: | command: |
...@@ -115,18 +127,19 @@ jobs: ...@@ -115,18 +127,19 @@ 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 --no-daemon 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: |
./gradlew assembleFossRelease --info --console=plain --stacktrace ./gradlew --no-daemon assembleFossRelease --info --console=plain --stacktrace
- store_artifacts: - store_artifacts:
path: app/build/outputs/apk path: app/build/outputs/apk
destination: apks destination: apks
......
app/build-sdk.sh
View file @ 7d27e753
...@@ -94,8 +94,8 @@ if ! check_git_dirty && ! check_last_commit && [ -f "${CURRENT_DIR}"/libs/common ...@@ -94,8 +94,8 @@ if ! check_git_dirty && ! check_last_commit && [ -f "${CURRENT_DIR}"/libs/common
exit 0 exit 0
fi fi
cd "${SDK_DIR}" && ./gradlew common:assemble && cd "${CURRENT_DIR}" cd "${SDK_DIR}" && ./gradlew --no-daemon common:assemble && cd "${CURRENT_DIR}"
cd "${SDK_DIR}" && ./gradlew core:assemble && cd "${CURRENT_DIR}" cd "${SDK_DIR}" && ./gradlew --no-daemon core:assemble && cd "${CURRENT_DIR}"
rm "${CURRENT_DIR}"/libs/common* "${CURRENT_DIR}"/libs/core* rm "${CURRENT_DIR}"/libs/common* "${CURRENT_DIR}"/libs/core*
......
build.gradle
View file @ 7d27e753
...@@ -10,16 +10,13 @@ buildscript { ...@@ -10,16 +10,13 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0-alpha12' 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 @ 7d27e753
...@@ -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