Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
Update dependencies to latest versions (#241)
Browse files Browse the repository at this point in the history
* Update dependencies to latest versions

* Update Travis CI components to support Android 25

* Resolve Travis CI build errors and document the fix"
  • Loading branch information
ryanwarsaw authored Dec 27, 2016
1 parent 5497583 commit f314fb5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 21 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ jdk: oraclejdk8
script: "./gradlew assembleLatest"
android:
components:
- tools
- platform-tools
# This solves a Travis CI bug with Android 25: https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
- tools
- build-tools-23.0.3
- android-23
- build-tools-25.0.2
- android-25
- extra-android-m2repository
- extra-google-m2repository
before_cache:
Expand Down
26 changes: 11 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 25
buildToolsVersion '25.0.2'

defaultConfig {
applicationId 'com.mozilla.hackathon.kiboko'
versionCode buildVersionCode()
versionName version
minSdkVersion 14
targetSdkVersion 23
targetSdkVersion 25
buildConfigField("boolean", "ENABLE_DEBUG_TOOLS", "false")
buildConfigField("String", "BOOTSTRAP_DATA_TIMESTAMP", "\"${bootstrap_data_timestamp}\"")
}
Expand Down Expand Up @@ -78,24 +78,20 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'

// Android support libraries.
compile "com.android.support:appcompat-v7:${android_support_lib_version}"
compile "com.android.support:cardview-v7:${android_support_lib_version}"
compile "com.android.support:support-v13:${android_support_lib_version}"
// JSON utility library.
compile 'com.google.code.gson:gson:2.4'
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:cardview-v7:25.1.0'
compile 'com.android.support:support-v13:25.1.0'

compile 'com.google.code.gson:gson:2.8.0'
compile 'com.google.guava:guava:19.0'

compile 'com.github.douglasjunior:android-simple-tooltip:0.1.2'
compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.3'

compile 'com.google.guava:guava:18.0'
// Helps with displaying complex html tags
// compile 'org.sufficientlysecure:html-textview:1.6'
compile project(":third_party:HtmlTextView")
// For Displaying gifs
compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.16'
}

apply from: "../artifacts.gradle"
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.1'
classpath 'com.android.tools.build:gradle:2.2.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
6 changes: 3 additions & 3 deletions third_party/HtmlTextView/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion '23.0.3'
compileSdkVersion 25
buildToolsVersion '25.0.2'

defaultConfig {
minSdkVersion 7
targetSdkVersion 23
targetSdkVersion 25
versionCode 7
versionName '1.6'
}
Expand Down

0 comments on commit f314fb5

Please sign in to comment.