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
d4e68eae
Commit
d4e68eae
authored
Jul 11, 2017
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update library, buildTools and sdk version ann add maven repository for support library.
parent
41d6e92e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
41 deletions
+42
-41
build.gradle
android-ddp/build.gradle
+5
-9
build.gradle
app/build.gradle
+8
-9
build.gradle
build.gradle
+11
-0
build.gradle
log-wrapper/build.gradle
+3
-3
build.gradle
persistence-realm/build.gradle
+6
-10
build.gradle
rocket-chat-android-widgets/build.gradle
+9
-10
No files found.
android-ddp/build.gradle
View file @
d4e68eae
...
@@ -13,8 +13,8 @@ buildscript {
...
@@ -13,8 +13,8 @@ buildscript {
}
}
android
{
android
{
compileSdkVersion
25
compileSdkVersion
rootProject
.
ext
.
compileSdkVersion
buildToolsVersion
'25.0.3'
buildToolsVersion
rootProject
.
ext
.
buildToolsVersion
compileOptions
{
compileOptions
{
sourceCompatibility
JavaVersion
.
VERSION_1_8
sourceCompatibility
JavaVersion
.
VERSION_1_8
...
@@ -22,7 +22,7 @@ android {
...
@@ -22,7 +22,7 @@ android {
}
}
defaultConfig
{
defaultConfig
{
minSdkVersion
16
minSdkVersion
16
targetSdkVersion
25
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
1
versionCode
1
versionName
"0.0.8"
versionName
"0.0.8"
}
}
...
@@ -34,18 +34,14 @@ android {
...
@@ -34,18 +34,14 @@ android {
}
}
}
}
ext
{
supportVersion
=
'25.3.1'
}
dependencies
{
dependencies
{
compile
project
(
':log-wrapper'
)
compile
project
(
':log-wrapper'
)
compile
"com.android.support:support-annotations:$
support
Version"
compile
"com.android.support:support-annotations:$
rootProject.ext.supportLibrary
Version"
compile
'com.squareup.okhttp3:okhttp:3.8.0'
compile
'com.squareup.okhttp3:okhttp:3.8.0'
compile
'io.reactivex.rxjava2:rxjava:2.1.0'
compile
'io.reactivex.rxjava2:rxjava:2.1.0'
compile
'com.parse.bolts:bolts-tasks:1.4.0'
compile
'com.parse.bolts:bolts-tasks:1.4.0'
}
}
\ No newline at end of file
app/build.gradle
View file @
d4e68eae
...
@@ -27,12 +27,12 @@ buildscript {
...
@@ -27,12 +27,12 @@ buildscript {
}
}
android
{
android
{
compileSdkVersion
25
compileSdkVersion
rootProject
.
ext
.
compileSdkVersion
buildToolsVersion
'25.0.3'
buildToolsVersion
rootProject
.
ext
.
buildToolsVersion
defaultConfig
{
defaultConfig
{
applicationId
"chat.rocket.android"
applicationId
"chat.rocket.android"
minSdkVersion
16
minSdkVersion
16
targetSdkVersion
25
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
25
versionCode
25
versionName
"1.0.15"
versionName
"1.0.15"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
...
@@ -75,7 +75,6 @@ play {
...
@@ -75,7 +75,6 @@ play {
}
}
ext
{
ext
{
supportVersion
=
'25.3.1'
playLibVersion
=
'10.2.6'
playLibVersion
=
'10.2.6'
stethoVersion
=
'1.4.2'
stethoVersion
=
'1.4.2'
rxbindingVersion
=
'2.0.0'
rxbindingVersion
=
'2.0.0'
...
@@ -91,8 +90,11 @@ dependencies {
...
@@ -91,8 +90,11 @@ dependencies {
compile
project
(
':rocket-chat-android-widgets'
)
compile
project
(
':rocket-chat-android-widgets'
)
compile
project
(
':persistence-realm'
)
compile
project
(
':persistence-realm'
)
compile
"com.android.support:appcompat-v7:$supportVersion"
compile
"com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
compile
"com.android.support:design:$supportVersion"
compile
"com.android.support:design:$rootProject.ext.supportLibraryVersion"
compile
"com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
compile
'com.android.support.constraint:constraint-layout:1.0.2'
compile
'com.android.support:multidex:1.0.1'
compile
'com.android.support:multidex:1.0.1'
...
@@ -124,9 +126,6 @@ dependencies {
...
@@ -124,9 +126,6 @@ dependencies {
compile
"com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
compile
"com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
annotationProcessor
"com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
annotationProcessor
"com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
compile
"com.android.support:support-annotations:$supportVersion"
compile
'com.android.support.constraint:constraint-layout:1.0.2'
}
}
apply
plugin:
'com.google.gms.google-services'
apply
plugin:
'com.google.gms.google-services'
build.gradle
View file @
d4e68eae
...
@@ -9,9 +9,20 @@ allprojects {
...
@@ -9,9 +9,20 @@ allprojects {
maven
{
url
'http://dl.bintray.com/amulyakhare/maven'
}
//for TextDrawable.
maven
{
url
'http://dl.bintray.com/amulyakhare/maven'
}
//for TextDrawable.
maven
{
url
"https://clojars.org/repo/"
}
//for icepick.
maven
{
url
"https://clojars.org/repo/"
}
//for icepick.
maven
{
url
'https://jitpack.io'
}
//for widget-fontawesome.
maven
{
url
'https://jitpack.io'
}
//for widget-fontawesome.
maven
{
url
"https://maven.google.com"
}
// for Support Library.
}
}
}
}
// This block encapsulates custom properties and makes them available to all modules in the project.
// You can also create properties to specify versions for dependencies.
// Having consistent versions between modules can avoid conflicts with behavior.
ext
{
compileSdkVersion
=
26
targetSdkVersion
=
26
buildToolsVersion
=
"26.0.0"
supportLibraryVersion
=
"25.4.0"
}
task
clean
(
type:
Delete
)
{
task
clean
(
type:
Delete
)
{
delete
rootProject
.
buildDir
delete
rootProject
.
buildDir
}
}
\ No newline at end of file
log-wrapper/build.gradle
View file @
d4e68eae
...
@@ -10,12 +10,12 @@ buildscript {
...
@@ -10,12 +10,12 @@ buildscript {
}
}
android
{
android
{
compileSdkVersion
25
compileSdkVersion
rootProject
.
ext
.
compileSdkVersion
buildToolsVersion
'25.0.3'
buildToolsVersion
rootProject
.
ext
.
buildToolsVersion
defaultConfig
{
defaultConfig
{
minSdkVersion
16
minSdkVersion
16
targetSdkVersion
25
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
1
versionCode
1
versionName
"1"
versionName
"1"
}
}
...
...
persistence-realm/build.gradle
View file @
d4e68eae
...
@@ -17,8 +17,8 @@ buildscript {
...
@@ -17,8 +17,8 @@ buildscript {
}
}
android
{
android
{
compileSdkVersion
25
compileSdkVersion
rootProject
.
ext
.
compileSdkVersion
buildToolsVersion
'25.0.3'
buildToolsVersion
rootProject
.
ext
.
buildToolsVersion
compileOptions
{
compileOptions
{
sourceCompatibility
JavaVersion
.
VERSION_1_8
sourceCompatibility
JavaVersion
.
VERSION_1_8
...
@@ -26,7 +26,7 @@ android {
...
@@ -26,7 +26,7 @@ android {
}
}
defaultConfig
{
defaultConfig
{
minSdkVersion
16
minSdkVersion
16
targetSdkVersion
25
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
1
versionCode
1
versionName
"1"
versionName
"1"
}
}
...
@@ -38,17 +38,13 @@ android {
...
@@ -38,17 +38,13 @@ android {
}
}
}
}
ext
{
supportVersion
=
'25.3.1'
}
dependencies
{
dependencies
{
compile
project
(
':log-wrapper'
)
compile
project
(
':log-wrapper'
)
compile
project
(
':rocket-chat-core'
)
compile
project
(
':rocket-chat-core'
)
compile
"com.android.support:support-annotations:$
support
Version"
compile
"com.android.support:support-annotations:$
rootProject.ext.supportLibrary
Version"
compile
"com.android.support:appcompat-v7:$
support
Version"
compile
"com.android.support:appcompat-v7:$
rootProject.ext.supportLibrary
Version"
compile
"com.android.support:design:$
support
Version"
compile
"com.android.support:design:$
rootProject.ext.supportLibrary
Version"
compile
'io.reactivex.rxjava2:rxjava:2.1.0'
compile
'io.reactivex.rxjava2:rxjava:2.1.0'
compile
'io.reactivex.rxjava2:rxandroid:2.0.1'
compile
'io.reactivex.rxjava2:rxandroid:2.0.1'
...
...
rocket-chat-android-widgets/build.gradle
View file @
d4e68eae
...
@@ -10,12 +10,12 @@ buildscript {
...
@@ -10,12 +10,12 @@ buildscript {
}
}
android
{
android
{
compileSdkVersion
25
compileSdkVersion
rootProject
.
ext
.
compileSdkVersion
buildToolsVersion
'25.0.3'
buildToolsVersion
rootProject
.
ext
.
buildToolsVersion
defaultConfig
{
defaultConfig
{
minSdkVersion
16
minSdkVersion
16
targetSdkVersion
25
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
1
versionCode
1
versionName
"1"
versionName
"1"
...
@@ -30,7 +30,6 @@ android {
...
@@ -30,7 +30,6 @@ android {
}
}
ext
{
ext
{
supportVersion
=
'25.3.1'
frescoVersion
=
'1.3.0'
frescoVersion
=
'1.3.0'
rxbindingVersion
=
'2.0.0'
rxbindingVersion
=
'2.0.0'
}
}
...
@@ -38,12 +37,12 @@ ext {
...
@@ -38,12 +37,12 @@ ext {
dependencies
{
dependencies
{
compile
project
(
':rocket-chat-core'
)
compile
project
(
':rocket-chat-core'
)
compile
"com.android.support:support-annotations:$
support
Version"
compile
"com.android.support:support-annotations:$
rootProject.ext.supportLibrary
Version"
compile
"com.android.support:appcompat-v7:$
support
Version"
compile
"com.android.support:appcompat-v7:$
rootProject.ext.supportLibrary
Version"
compile
"com.android.support:recyclerview-v7:$
support
Version"
compile
"com.android.support:recyclerview-v7:$
rootProject.ext.supportLibrary
Version"
compile
"com.android.support:cardview-v7:$
support
Version"
compile
"com.android.support:cardview-v7:$
rootProject.ext.supportLibrary
Version"
compile
"com.android.support:support-v13:$
support
Version"
compile
"com.android.support:support-v13:$
rootProject.ext.supportLibrary
Version"
compile
"com.android.support:design:$
support
Version"
compile
"com.android.support:design:$
rootProject.ext.supportLibrary
Version"
compile
'org.nibor.autolink:autolink:0.6.0'
compile
'org.nibor.autolink:autolink:0.6.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