Skip to content

Commit

Permalink
Updated most libraries to the latest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
fusion44 committed Nov 12, 2016
1 parent a4af498 commit 397666d
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 49 deletions.
7 changes: 0 additions & 7 deletions .idea/dictionaries/fusion44.xml

This file was deleted.

9 changes: 1 addition & 8 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 30 additions & 28 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'me.tatarka.retrolambda'

android {
compileSdkVersion 24
compileSdkVersion 25
buildToolsVersion "24.0.0"
defaultConfig {
applicationId "space.galactictavern.app"
minSdkVersion 16
targetSdkVersion 24
targetSdkVersion 25
versionCode 1
versionName "0.9-beta1"
multiDexEnabled true
Expand Down Expand Up @@ -44,53 +44,55 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')

compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:design:24.1.1'
compile 'com.android.support:percent:24.1.1'
compile 'com.android.support:customtabs:24.1.1'
compile 'com.android.support:support-v4:24.1.1'
compile 'com.android.support:cardview-v7:24.1.1'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:design:25.0.0'
compile 'com.android.support:percent:25.0.0'
compile 'com.android.support:customtabs:25.0.0'
compile 'com.android.support:support-v4:25.0.0'
compile 'com.android.support:cardview-v7:25.0.0'
compile 'com.android.support:multidex:1.0.1'

// For setting up the background task which fetches latest comm links every n times
compile 'com.google.firebase:firebase-core:9.0.0'
compile "com.google.firebase:firebase-messaging:9.0.0"
compile 'com.google.firebase:firebase-crash:9.0.0'

compile 'io.reactivex:rxjava:1.1.5'
compile 'com.artemzin.rxjava:proguard-rules:1.1.5.0'
compile 'io.reactivex:rxjava:1.2.1'
compile 'com.artemzin.rxjava:proguard-rules:1.2.1.0'

compile 'com.hardsoftstudio:rxflux:0.4.1'
compile 'com.squareup.retrofit2:retrofit:2.0.2'
compile 'com.squareup.retrofit2:converter-gson:2.0.2'
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
compile 'com.jakewharton.timber:timber:4.1.2'
compile 'com.jakewharton:butterknife:8.0.1'
apt 'com.jakewharton:butterknife-compiler:8.0.1'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
compile 'com.jakewharton.timber:timber:4.3.1'
compile 'com.jakewharton:butterknife:8.4.0'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
compile 'com.malinskiy:superrecyclerview:1.1.4'
compile 'com.github.jd-alexander:LikeButton:0.2.0'
compile 'jp.wasabeef:recyclerview-animators:2.2.3'
compile 'jp.wasabeef:recyclerview-animators:2.2.4'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'net.danlew:android.joda:2.9.3'
compile 'com.pushtorefresh.storio:sqlite:1.8.0'
compile 'com.pushtorefresh.storio:sqlite-annotations:1.8.0'
apt 'com.pushtorefresh.storio:sqlite-annotations-processor:1.8.0'
compile 'net.danlew:android.joda:2.9.5'
compile 'com.pushtorefresh.storio:sqlite:1.11.0'
compile 'com.pushtorefresh.storio:sqlite-annotations:1.11.0'
apt 'com.pushtorefresh.storio:sqlite-annotations-processor:1.11.0'
compile 'org.apmem.tools:layouts:1.10@aar'
compile 'com.github.renaudcerrato:FloatingSearchView:1.0.0'
compile 'com.klinkerapps:sliding-activity:1.2.3'
compile 'com.github.renaudcerrato:FloatingSearchView:1.0.1'
compile 'com.klinkerapps:sliding-activity:1.4.4'
compile 'com.makeramen:roundedimageview:2.2.1'
compile 'com.pixplicity.easyprefs:library:1.8.1@aar'
compile('com.mikepenz:aboutlibraries:5.6.6@aar') {
compile('com.mikepenz:aboutlibraries:5.8.5@aar') {
transitive = true
}

// This if for converting full country name to its short ISO representation and the other way around
// Norway -> NO
compile 'com.neovisionaries:nv-i18n:1.18'
compile 'com.neovisionaries:nv-i18n:1.21'

debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
debugCompile 'com.facebook.stetho:stetho:1.3.1'
debugCompile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
debugCompile 'com.facebook.stetho:stetho:1.4.1'
debugCompile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
testCompile 'junit:junit:4.12'
compile project(path: ':imglib')
compile project(':mapcore')
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'

// for imglib
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Feb 13 16:54:15 CET 2016
#Thu Aug 25 18:31:50 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
2 changes: 1 addition & 1 deletion mapcore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
maven { url "https://oss.sonatype.org/content/repositories/releases/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.2.2'
}
}

Expand Down

0 comments on commit 397666d

Please sign in to comment.