Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
7d27e753
Unverified
Commit
7d27e753
authored
Oct 31, 2018
by
Leonardo Aramaki
Committed by
GitHub
Oct 31, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into add-permalink
parents
8a1e6710
72d925f8
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
294 additions
and
39 deletions
+294
-39
config.yml
.circleci/config.yml
+41
-28
build-sdk.sh
app/build-sdk.sh
+2
-2
MessageParser.kt
...src/main/java/chat/rocket/android/helper/MessageParser.kt
+248
-3
build.gradle
build.gradle
+2
-5
dependencies.gradle
dependencies.gradle
+1
-1
No files found.
.circleci/config.yml
View file @
7d27e753
version
:
2
build
:
machine
:
java
:
oraclejdk8
jobs
:
build-kotlin-sdk
:
docker
:
-
image
:
circleci/android:api-2
7
-alpha
-
image
:
circleci/android:api-2
8
-alpha
environment
:
J
VM_OPTS
:
-Xmx3200
m
J
AVA_TOOL_OPTIONS
:
-Xmx5024
m
steps
:
-
checkout
-
run
:
...
...
@@ -18,8 +21,9 @@ jobs:
command
:
pushd app/ ; ./build-sdk.sh ; popd
-
save_cache
:
paths
:
-
~/.gradle
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-
~/.gradle/caches
-
~/.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
:
paths
:
-
app/libs/
...
...
@@ -30,9 +34,9 @@ jobs:
destination
:
libs
code-analysis
:
docker
:
-
image
:
circleci/android:api-2
7
-alpha
-
image
:
circleci/android:api-2
8
-alpha
environment
:
J
VM_OPTS
:
-Xmx3200
m
J
AVA_TOOL_OPTIONS
:
-Xmx5024
m
steps
:
-
checkout
-
run
:
...
...
@@ -44,33 +48,37 @@ jobs:
-
restore_cache
:
key
:
kotlin-sdk-{{ .Revision }}
-
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
:
name
:
Download Dependencies
command
:
./gradlew androidDependencies --quiet --console=plain
command
:
./gradlew
--no-daemon
androidDependencies --quiet --console=plain
-
save_cache
:
paths
:
-
~/.gradle
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-
~/.gradle/caches
-
~/.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
:
name
:
Run Lint
#, Checkstyles, PMD, Findbugs...
command
:
./gradlew lint
command
:
./gradlew
--no-daemon
lint
-
run
:
name
:
Run Unit test
command
:
./gradlew test
command
:
./gradlew
--no-daemon
test
-
run
:
name
:
Compile Instrumentation test
command
:
./gradlew assembleAndroidTest
command
:
./gradlew
--no-daemon
assembleAndroidTest
-
store_artifacts
:
path
:
app/build/reports/
destination
:
reports
build-play-apk
:
docker
:
-
image
:
circleci/android:api-2
7
-alpha
-
image
:
circleci/android:api-2
8
-alpha
environment
:
J
VM_OPTS
:
-Xmx3200
m
J
AVA_TOOL_OPTIONS
:
-Xmx5024
m
steps
:
-
checkout
-
run
:
name
:
ANDROID_HOME
command
:
echo "sdk.dir="$ANDROID_HOME > local.properties
-
run
:
name
:
restore files from ENV
command
:
|
...
...
@@ -82,28 +90,32 @@ jobs:
-
restore_cache
:
key
:
kotlin-sdk-{{ .Revision }}
-
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
:
name
:
Download Dependencies
command
:
./gradlew androidDependencies --quiet --console=plain
command
:
./gradlew
--no-daemon
androidDependencies --quiet --console=plain
-
save_cache
:
paths
:
-
~/.gradle
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-
~/.gradle/caches
-
~/.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
:
name
:
Build APK
command
:
|
./gradlew assemblePlayRelease --info --console=plain --stacktrace
./gradlew
--no-daemon
assemblePlayRelease --info --console=plain --stacktrace
-
store_artifacts
:
path
:
app/build/outputs/apk
destination
:
apks
build-foss-apk
:
docker
:
-
image
:
circleci/android:api-2
7
-alpha
-
image
:
circleci/android:api-2
8
-alpha
environment
:
J
VM_OPTS
:
-Xmx3200
m
J
AVA_TOOL_OPTIONS
:
-Xmx5024
m
steps
:
-
checkout
-
run
:
name
:
ANDROID_HOME
command
:
echo "sdk.dir="$ANDROID_HOME > local.properties
-
run
:
name
:
restore files from ENV
command
:
|
...
...
@@ -115,18 +127,19 @@ jobs:
-
restore_cache
:
key
:
kotlin-sdk-{{ .Revision }}
-
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
:
name
:
Download Dependencies
command
:
./gradlew androidDependencies --quiet --console=plain
command
:
./gradlew
--no-daemon
androidDependencies --quiet --console=plain
-
save_cache
:
paths
:
-
~/.gradle
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-
~/.gradle/caches
-
~/.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
:
name
:
Build APK
command
:
|
./gradlew assembleFossRelease --info --console=plain --stacktrace
./gradlew
--no-daemon
assembleFossRelease --info --console=plain --stacktrace
-
store_artifacts
:
path
:
app/build/outputs/apk
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
exit
0
fi
cd
"
${
SDK_DIR
}
"
&&
./gradlew common:assemble
&&
cd
"
${
CURRENT_DIR
}
"
cd
"
${
SDK_DIR
}
"
&&
./gradlew core:assemble
&&
cd
"
${
CURRENT_DIR
}
"
cd
"
${
SDK_DIR
}
"
&&
./gradlew
--no-daemon
common:assemble
&&
cd
"
${
CURRENT_DIR
}
"
cd
"
${
SDK_DIR
}
"
&&
./gradlew
--no-daemon
core:assemble
&&
cd
"
${
CURRENT_DIR
}
"
rm
"
${
CURRENT_DIR
}
"
/libs/common
*
"
${
CURRENT_DIR
}
"
/libs/core
*
...
...
app/src/main/java/chat/rocket/android/helper/MessageParser.kt
View file @
7d27e753
This diff is collapsed.
Click to expand it.
build.gradle
View file @
7d27e753
...
...
@@ -10,16 +10,13 @@ buildscript {
}
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.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
"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 {
dokka
:
'0.9.16'
,
// For app
kotlin
:
'1.2.
6
1'
,
kotlin
:
'1.2.
7
1'
,
coroutine
:
'0.25.0'
,
appCompat
:
'1.0.0'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment