sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-21 05:09:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to android studio 2.3

Browse source
This commit is contained in:
Phillip Thelen 2017-03-23 11:01:21 +01:00
parent 2d5680ed80
commit 9c78d519f5
6 changed files with 6699 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Habitica/build.gradle
View file

@ -46,11 +46,11 @@ dependencies {
compile 'com.squareup.okhttp3:okhttp:3.6.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
//REST API handling
compile('com.squareup.retrofit2:retrofit:2.1.0') {
compile('com.squareup.retrofit2:retrofit:2.2.0') {
exclude module: 'okhttp'
}
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.2.0'
compile 'com.squareup.retrofit2:adapter-rxjava:2.2.0'
//Crash Logging
releaseCompile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
@ -69,10 +69,10 @@ dependencies {
compile('com.mikepenz:materialdrawer:5.3.6@aar') {
transitive = true
}
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:design:25.1.1'
compile 'com.android.support:recyclerview-v7:25.1.1'
compile 'com.android.support:preference-v14:25.1.1'
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:design:25.3.0'
compile 'com.android.support:recyclerview-v7:25.3.0'
compile 'com.android.support:preference-v14:25.3.0'
compile 'com.android.support:multidex:1.0.1'
//QR Code
@ -138,10 +138,10 @@ dependencies {
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
//Push Notifications
compile 'com.google.firebase:firebase-core:10.0.1'
compile 'com.google.firebase:firebase-messaging:10.0.1'
compile 'com.google.firebase:firebase-core:10.2.0'
compile 'com.google.firebase:firebase-messaging:10.2.0'
compile 'com.google.android.gms:play-services-auth:10.0.1'
compile 'com.google.android.gms:play-services-auth:10.2.0'
compile 'org.apmem.tools:layouts:1.10@aar'
@ -153,7 +153,7 @@ dependencies {
android {
compileSdkVersion 25
buildToolsVersion "24.0.3"
buildToolsVersion "25.0.0"
defaultConfig {
applicationId "com.habitrpg.android.habitica"

2
Habitica/res/values/colors.xml
View file

@ -55,6 +55,8 @@
<color name="changelog.note">#ffcf42</color>
<color name="colorPrimary">@color/brand_300</color>
<color name="colorPrimaryDark">@color/brand_50</color>
<!-- text -->
<color name="textColorDark">#FFFFFF</color>
<color name="textColorSecondaryDark">@color/brand_500</color>

2
build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.databinding:dataBinder:1.0-rc4'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.google.gms:google-services:3.0.0'

5
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,6 @@
#Thu Sep 29 20:11:45 CEST 2016
#Thu Mar 23 10:38:10 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

6679
projectFilesBackup/.idea/workspace.xml Normal file
View file

File diff suppressed because it is too large Load diff

8
seeds-sdk/build.gradle
View file

@ -12,10 +12,10 @@ buildscript {
android {
compileSdkVersion 25
buildToolsVersion "24.0.3"
buildToolsVersion "25.0.0"
defaultConfig {
minSdkVersion 12
minSdkVersion 14
versionCode 1
versionName "1.0"
@ -46,8 +46,8 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'org.glassfish:javax.json:1.0.4'
compile 'com.google.android.gms:play-services:10.0.1'
compile 'com.google.code.gson:gson:2.4'
compile 'com.google.android.gms:play-services:10.2.0'
compile 'com.google.code.gson:gson:2.7'
compile 'com.android.support:multidex:1.0.1'
compile 'com.loopj.android:android-async-http:1.4.9'
compile 'org.solovyev.android:checkout:0.9.1@aar'