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
1b91db74
Commit
1b91db74
authored
May 15, 2019
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'develop' into PR.
parent
6f4e36cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
24 deletions
+36
-24
build.gradle
app/build.gradle
+36
-24
No files found.
app/build.gradle
View file @
1b91db74
...
@@ -2,7 +2,9 @@ def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
...
@@ -2,7 +2,9 @@ def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
def
isPlay
=
!(
taskRequests
.
contains
(
"Foss"
)
||
taskRequests
.
contains
(
"foss"
))
def
isPlay
=
!(
taskRequests
.
contains
(
"Foss"
)
||
taskRequests
.
contains
(
"foss"
))
apply
plugin:
'com.android.application'
apply
plugin:
'com.android.application'
if
(
isPlay
)
{
apply
plugin:
'io.fabric'
}
if
(
isPlay
)
{
apply
plugin:
'io.fabric'
}
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android-extensions'
apply
plugin:
'kotlin-android-extensions'
apply
plugin:
'kotlin-kapt'
apply
plugin:
'kotlin-kapt'
...
@@ -16,13 +18,12 @@ android {
...
@@ -16,13 +18,12 @@ android {
applicationId
"chat.rocket.android"
applicationId
"chat.rocket.android"
minSdkVersion
versions
.
minSdk
minSdkVersion
versions
.
minSdk
targetSdkVersion
versions
.
targetSdk
targetSdkVersion
versions
.
targetSdk
versionCode
20
57
versionCode
20
65
versionName
"3.
2
.0"
versionName
"3.
4
.0"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled
true
multiDexEnabled
true
def
gitSha
=
'git rev-parse --short HEAD'
.
execute
([],
project
.
rootDir
).
text
.
trim
()
def
gitSha
=
'git rev-parse --short HEAD'
.
execute
([],
project
.
rootDir
).
text
.
trim
()
def
buildTime
=
new
GregorianCalendar
().
format
(
"MM-dd-yyyy' 'h:mm:ss a z"
)
buildConfigField
"String"
,
"GIT_SHA"
,
"\"${gitSha}\""
buildConfigField
"String"
,
"GIT_SHA"
,
"\"${gitSha}\""
javaCompileOptions
{
javaCompileOptions
{
...
@@ -30,6 +31,17 @@ android {
...
@@ -30,6 +31,17 @@ android {
arguments
=
[
"room.schemaLocation"
:
"$projectDir/schemas"
.
toString
()]
arguments
=
[
"room.schemaLocation"
:
"$projectDir/schemas"
.
toString
()]
}
}
}
}
// For Jitsi
compileOptions
{
sourceCompatibility
JavaVersion
.
VERSION_1_8
targetCompatibility
JavaVersion
.
VERSION_1_8
}
// For Jitsi
ndk
{
abiFilters
"armeabi-v7a"
,
"x86"
}
}
}
signingConfigs
{
signingConfigs
{
...
@@ -73,7 +85,7 @@ android {
...
@@ -73,7 +85,7 @@ android {
dimension
"type"
dimension
"type"
}
}
// only
foss
// only
FOSS
foss
{
foss
{
dimension
"type"
dimension
"type"
}
}
...
@@ -83,6 +95,10 @@ android {
...
@@ -83,6 +95,10 @@ android {
exclude
'META-INF/core.kotlin_module'
exclude
'META-INF/core.kotlin_module'
exclude
'META-INF/main.kotlin_module'
exclude
'META-INF/main.kotlin_module'
}
}
lintOptions
{
lintConfig
file
(
"src/main/res/xml/lint.xml"
)
}
}
}
dependencies
{
dependencies
{
...
@@ -96,7 +112,7 @@ dependencies {
...
@@ -96,7 +112,7 @@ dependencies {
implementation
project
(
':suggestions'
)
implementation
project
(
':suggestions'
)
implementation
libraries
.
kotlin
implementation
libraries
.
kotlin
implementation
libraries
.
coroutines
implementation
libraries
.
coroutines
Core
implementation
libraries
.
coroutinesAndroid
implementation
libraries
.
coroutinesAndroid
implementation
libraries
.
appCompat
implementation
libraries
.
appCompat
...
@@ -123,6 +139,8 @@ dependencies {
...
@@ -123,6 +139,8 @@ dependencies {
implementation
libraries
.
viewmodelKtx
implementation
libraries
.
viewmodelKtx
implementation
libraries
.
workmanager
implementation
libraries
.
workmanager
implementation
libraries
.
livedataKtx
implementation
libraries
.
rxKotlin
implementation
libraries
.
rxKotlin
implementation
libraries
.
rxAndroid
implementation
libraries
.
rxAndroid
...
@@ -133,25 +151,25 @@ dependencies {
...
@@ -133,25 +151,25 @@ dependencies {
implementation
libraries
.
timber
implementation
libraries
.
timber
implementation
libraries
.
threeTenABP
implementation
libraries
.
threeTenABP
kapt
libraries
.
kotshiCompiler
implementation
libraries
.
kotshiApi
implementation
libraries
.
fresco
implementation
libraries
.
fresco
api
libraries
.
frescoOkHttp
api
libraries
.
frescoOkHttp
implementation
libraries
.
frescoAnimatedGif
implementation
libraries
.
frescoAnimatedGif
implementation
libraries
.
frescoWebP
implementation
libraries
.
frescoWebP
implementation
libraries
.
frescoAnimatedWebP
implementation
libraries
.
frescoAnimatedWebP
implementation
libraries
.
glide
implementation
libraries
.
glideTransformations
kapt
libraries
.
kotshiCompiler
implementation
libraries
.
kotshiApi
implementation
libraries
.
frescoImageViewer
implementation
libraries
.
frescoImageViewer
implementation
libraries
.
markwon
implementation
libraries
.
markwon
implementation
libraries
.
aVLoadingIndicatorView
implementation
libraries
.
aVLoadingIndicatorView
implementation
libraries
.
livedataKtx
implementation
libraries
.
glide
implementation
libraries
.
glideTransformations
implementation
(
libraries
.
jitsi
)
{
transitive
=
true
}
implementation
'com.google.code.findbugs:jsr305:3.0.2'
implementation
'com.google.code.findbugs:jsr305:3.0.2'
...
@@ -159,8 +177,8 @@ dependencies {
...
@@ -159,8 +177,8 @@ dependencies {
playImplementation
libraries
.
fcm
playImplementation
libraries
.
fcm
playImplementation
libraries
.
firebaseAnalytics
playImplementation
libraries
.
firebaseAnalytics
playImplementation
libraries
.
playServicesAuth
playImplementation
libraries
.
playServicesAuth
playImplementation
(
'com.crashlytics.sdk.android:crashlytics:2.9.
5
@aar'
)
{
transitive
=
true
}
playImplementation
(
'com.crashlytics.sdk.android:crashlytics:2.9.
8
@aar'
)
{
transitive
=
true
}
playImplementation
(
'com.crashlytics.sdk.android:answers:1.4.
3
@aar'
)
{
transitive
=
true
}
playImplementation
(
'com.crashlytics.sdk.android:answers:1.4.
6
@aar'
)
{
transitive
=
true
}
testImplementation
libraries
.
junit
testImplementation
libraries
.
junit
testImplementation
libraries
.
truth
testImplementation
libraries
.
truth
...
@@ -168,12 +186,6 @@ dependencies {
...
@@ -168,12 +186,6 @@ dependencies {
androidTestImplementation
libraries
.
espressoIntents
androidTestImplementation
libraries
.
espressoIntents
}
}
kotlin
{
experimental
{
coroutines
"enable"
}
}
androidExtensions
{
androidExtensions
{
experimental
=
true
experimental
=
true
}
}
...
@@ -181,8 +193,8 @@ androidExtensions {
...
@@ -181,8 +193,8 @@ androidExtensions {
// FIXME - build and install the sdk into the app/libs directory
// FIXME - build and install the sdk into the app/libs directory
// We were having some issues with the kapt generated files from the sdk when importing as a module
// We were having some issues with the kapt generated files from the sdk when importing as a module
def
sdk_location
=
project
.
properties
[
'sdk_location'
]
?:
""
def
sdk_location
=
project
.
properties
[
'sdk_location'
]
?:
""
task
compileSdk
(
type:
Exec
)
{
task
compileSdk
(
type:
Exec
)
{
if
(
System
.
getProperty
(
'os.name'
).
toLowerCase
(
Locale
.
ROOT
).
contains
(
'windows'
))
{
if
(
System
.
getProperty
(
'os.name'
).
toLowerCase
(
Locale
.
ROOT
).
contains
(
'windows'
))
{
commandLine
'cmd'
,
'/c'
,
'build-sdk.sh'
,
sdk_location
commandLine
'cmd'
,
'/c'
,
'build-sdk.sh'
,
sdk_location
}
else
{
}
else
{
...
@@ -192,4 +204,4 @@ task compileSdk(type:Exec) {
...
@@ -192,4 +204,4 @@ task compileSdk(type:Exec) {
preBuild
.
dependsOn
compileSdk
preBuild
.
dependsOn
compileSdk
if
(
isPlay
)
{
if
(
isPlay
)
{
apply
plugin:
'com.google.gms.google-services'
apply
plugin:
'com.google.gms.google-services'
}
}
\ No newline at end of file
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