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
3fa0cd78
Commit
3fa0cd78
authored
Jul 12, 2017
by
Rafael Kellermann Streit
Committed by
GitHub
Jul 12, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #349 from filipedelimabrito/ci-fix
Update app version and CI files.
parents
3df27cb9
4fcd0459
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
.travis.yml
.travis.yml
+1
-1
build.gradle
app/build.gradle
+2
-2
circle.yml
circle.yml
+3
-3
No files found.
.travis.yml
View file @
3fa0cd78
...
...
@@ -10,7 +10,7 @@ android:
-
build-tools-25.0.3
# Match build-tools version used in build.gradle
-
platform-tools
# Update platform-tools to revision 25.0.3+
-
tools
# Update tools from revision 24.4.1 to 25.2.5
env
:
global
:
-
API=26
# Android API level 26 by default
...
...
app/build.gradle
View file @
3fa0cd78
...
...
@@ -33,8 +33,8 @@ android {
applicationId
"chat.rocket.android"
minSdkVersion
16
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
2
5
versionName
"1.0.1
5
"
versionCode
2
6
versionName
"1.0.1
6
"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
vectorDrawables
.
useSupportLibrary
=
true
...
...
circle.yml
View file @
3fa0cd78
...
...
@@ -23,13 +23,13 @@ dependencies:
-
echo $API_KEY_STRINGS_BASE64 | base64 --decode > app/src/release/res/values/api_key_strings.xml
-
echo y | android update sdk --no-ui --all --filter tools,platform-tools
-
echo y | android update sdk --no-ui --all --filter android-2
5
-
echo y | android update sdk --no-ui --all --filter android-2
6
-
echo y | android update sdk --no-ui --all --filter extra-android-m2repository,extra-android-support
-
echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services
-
echo y | android update sdk --no-ui --all --filter build-tools-2
5.0.3
-
echo y | android update sdk --no-ui --all --filter build-tools-2
6.0.0
cache_directories
:
-
/usr/local/android-sdk-linux/tools
-
/usr/local/android-sdk-linux/build-tools/2
5.0.3
-
/usr/local/android-sdk-linux/build-tools/2
6.0.0
test
:
override
:
...
...
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