From 5b12fb61dccb2e9ca9a13232bc5bb3d3b0e8c479 Mon Sep 17 00:00:00 2001 From: maiatoday Date: Sun, 4 Jun 2017 17:24:24 +0200 Subject: [PATCH] New versions and changes so I can use studio 3 Build file updates and fixes. New versions so this project can be opened in studio preview. This will allow us to use the new profiler to find the memory leaks. --- Habitica/build.gradle | 121 +++++++++++------------ build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 2 +- seeds-sdk/build.gradle | 30 +++--- 4 files changed, 79 insertions(+), 80 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 90d18be15..4a50e002f 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -1,7 +1,5 @@ apply plugin: 'com.android.application' -apply plugin: 'com.android.databinding' apply plugin: 'io.fabric' -apply plugin: 'com.neenbedankt.android-apt' apply plugin: 'com.noveogroup.android.check' buildscript { @@ -12,9 +10,7 @@ buildscript { jcenter() } dependencies { - classpath 'io.fabric.tools:gradle:1.21.6' - classpath 'me.tatarka:gradle-retrolambda:3.3.1' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'io.fabric.tools:gradle:1.22.1' classpath('com.noveogroup.android:check:1.2.3') { exclude module: 'checkstyle' exclude module: 'pmd-java' @@ -40,116 +36,116 @@ repositories { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) //Networking - compile 'com.squareup.okhttp3:okhttp:3.6.0' - compile 'com.squareup.okhttp3:logging-interceptor:3.6.0' + implementation 'com.squareup.okhttp3:okhttp:3.7.0' + implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0' //REST API handling - compile('com.squareup.retrofit2:retrofit:2.2.0') { + implementation('com.squareup.retrofit2:retrofit:2.2.0') { exclude module: 'okhttp' } - compile 'com.squareup.retrofit2:converter-gson:2.2.0' - compile 'com.squareup.retrofit2:adapter-rxjava:2.2.0' + implementation 'com.squareup.retrofit2:converter-gson:2.2.0' + implementation 'com.squareup.retrofit2:adapter-rxjava:2.2.0' //Crash Logging - releaseCompile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') { - transitive = true; + releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') { + transitive = true } // View Elements Binding :) - compile 'com.jakewharton:butterknife:8.5.1' - apt 'com.jakewharton:butterknife-compiler:8.5.1' + implementation 'com.jakewharton:butterknife:8.5.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' //Dependency Injection - compile 'com.google.dagger:dagger:2.10' - apt 'com.google.dagger:dagger-compiler:2.10' - provided 'org.glassfish:javax.annotation:10.0-b28' + implementation 'com.google.dagger:dagger:2.10' + annotationProcessor 'com.google.dagger:dagger-compiler:2.10' + compileOnly 'org.glassfish:javax.annotation:10.0-b28' //App Compatibility and Material Design - compile('com.mikepenz:materialdrawer:5.8.3@aar') { + implementation('com.mikepenz:materialdrawer:5.8.3@aar') { transitive = true } - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:design:25.3.1' - compile 'com.android.support:recyclerview-v7:25.3.1' - compile 'com.android.support:preference-v14:25.3.1' - compile 'com.android.support:multidex:1.0.1' + implementation 'com.android.support:appcompat-v7:25.3.1' + implementation 'com.android.support:design:25.3.1' + implementation 'com.android.support:recyclerview-v7:25.3.1' + implementation 'com.android.support:preference-v14:25.3.1' + implementation 'com.android.support:multidex:1.0.1' //QR Code - compile 'com.github.kenglxn.QRGen:android:2.2.0' + implementation 'com.github.kenglxn.QRGen:android:2.2.0' // Emojis - compile 'com.github.viirus:emoji-lib:0.0.3.4' + implementation 'com.github.viirus:emoji-lib:0.0.3.4' // Markdown - compile 'com.commonsware.cwac:anddown:0.3.0' + implementation 'com.commonsware.cwac:anddown:0.3.0' // About View for all dependent Libraries, we are using - compile('com.mikepenz:aboutlibraries:5.9.4@aar') { + implementation('com.mikepenz:aboutlibraries:5.9.4@aar') { transitive = true } // a better fab alternative - compile 'com.github.clans:fab:1.6.4' + implementation 'com.github.clans:fab:1.6.4' // ORM - apt 'com.raizlabs.android:DBFlow-Compiler:2.2.1' - compile "com.raizlabs.android:DBFlow-Core:2.2.1" - compile "com.raizlabs.android:DBFlow:2.2.1" + annotationProcessor 'com.raizlabs.android:DBFlow-Compiler:2.2.1' + implementation "com.raizlabs.android:DBFlow-Core:2.2.1" + implementation "com.raizlabs.android:DBFlow:2.2.1" //Eventbus - compile 'org.greenrobot:eventbus:3.0.0' + implementation 'org.greenrobot:eventbus:3.0.0' // IAP Handling / Verification - compile 'org.solovyev.android:checkout:0.9.3@aar' + implementation 'org.solovyev.android:checkout:0.9.3@aar' //Facebook - compile('com.facebook.android:facebook-android-sdk:4.19.0') { + implementation('com.facebook.android:facebook-android-sdk:4.19.0') { transitive = true } - compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar' + implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar' // lodash/underscore - compile 'com.github.javadev:underscore:1.23' + implementation 'com.github.javadev:underscore:1.23' //RxJava - compile 'io.reactivex:rxandroid:1.2.1' - compile 'io.reactivex:rxjava:1.2.0' + implementation 'io.reactivex:rxandroid:1.2.1' + implementation 'io.reactivex:rxjava:1.2.0' //Analytics - compile 'com.amplitude:android-sdk:2.13.3' + implementation 'com.amplitude:android-sdk:2.13.3' // Fresco Image Management Library - compile('com.facebook.fresco:fresco:1.3.0') { + implementation('com.facebook.fresco:fresco:1.3.0') { exclude module: 'bolts-android' } - compile('com.facebook.fresco:animated-gif:1.3.0') { + implementation('com.facebook.fresco:animated-gif:1.3.0') { exclude module: 'bolts-android' } //Tests - testCompile "junit:junit:4.10" - testCompile "org.assertj:assertj-core:1.7.0" - testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' - testCompile "org.robolectric:robolectric:3.2" - testCompile 'org.robolectric:shadows-multidex:3.1' - testCompile "org.robolectric:shadows-support-v4:3.1" - testCompile "org.mockito:mockito-core:1.10.19" + testImplementation "junit:junit:4.12" + testImplementation "org.assertj:assertj-core:1.7.0" + testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' + testImplementation "org.robolectric:robolectric:3.2" + testImplementation 'org.robolectric:shadows-multidex:3.1' + testImplementation "org.robolectric:shadows-support-v4:3.1" + testImplementation "org.mockito:mockito-core:2.8.9" //Leak Detection - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5' + releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' //Push Notifications - compile 'com.google.firebase:firebase-core:10.2.0' - compile 'com.google.firebase:firebase-messaging:10.2.0' + implementation 'com.google.firebase:firebase-core:10.2.6' + implementation 'com.google.firebase:firebase-messaging:10.2.6' - compile 'com.google.android.gms:play-services-auth:10.2.0' + implementation 'com.google.android.gms:play-services-auth:10.2.6' - compile 'org.apmem.tools:layouts:1.10@aar' + implementation 'org.apmem.tools:layouts:1.10@aar' - compile 'com.roughike:bottom-bar:2.2.0' + implementation 'com.roughike:bottom-bar:2.2.0' - compile(project(':seeds-sdk')) { + implementation(project(':seeds-sdk')) { exclude group: 'com.google.android.gms' exclude group: 'com.android.support', module: 'multidex' } @@ -157,7 +153,7 @@ dependencies { android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "25.0.3" defaultConfig { applicationId "com.habitrpg.android.habitica" @@ -192,9 +188,9 @@ android { } } + flavorDimensions "default" productFlavors { dev { - minSdkVersion 21 } prod { @@ -238,9 +234,13 @@ android { disable 'UnusedResources','MissingTranslation','UnusedAttribute','InvalidPackage' enable 'LogConditional','IconExpectedSize','MissingRegistered','TypographyQuotes' } + + dataBinding { + enabled = true + } } -def Properties props = new Properties() +Properties props = new Properties() def propFile = new File('signingrelease.properties') if (propFile.canRead()) { props.load(new FileInputStream(propFile)) @@ -307,5 +307,4 @@ tasks.whenTaskAdded { task -> check { findbugs { skip true } } apply plugin: 'com.android.application' //or apply plugin: 'java' -apply plugin: 'me.tatarka.retrolambda' apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0657341a8..5ef3a0842 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' - classpath 'com.android.databinding:dataBinder:1.0-rc4' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.android.tools.build:gradle:3.0.0-alpha3' classpath 'com.google.gms:google-services:3.0.0' } } @@ -15,5 +14,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb767318e..bb378a8ca 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-2-all.zip diff --git a/seeds-sdk/build.gradle b/seeds-sdk/build.gradle index fee18da6c..b9d2ee5ee 100755 --- a/seeds-sdk/build.gradle +++ b/seeds-sdk/build.gradle @@ -6,14 +6,14 @@ buildscript { jcenter() } dependencies { - classpath 'com.novoda:bintray-release:0.3.4' + classpath 'com.novoda:bintray-release:0.5.0' } } android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "25.0.3" defaultConfig { minSdkVersion 14 @@ -45,19 +45,19 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'org.glassfish:javax.json:1.0.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' - androidTestCompile 'org.mockito:mockito-core:1.9.5' - androidTestCompile 'com.google.dexmaker:dexmaker:1.0' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0' - testCompile 'junit:junit:4.12' - testCompile "org.robolectric:robolectric:3.0" - testCompile "org.robolectric:shadows-multidex:3.0" + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'org.glassfish:javax.json:1.0.4' + implementation 'com.google.android.gms:play-services:10.2.6' + implementation 'com.google.code.gson:gson:2.8.0' + implementation 'com.android.support:multidex:1.0.1' + implementation 'com.loopj.android:android-async-http:1.4.9' + implementation 'org.solovyev.android:checkout:0.9.3@aar' + androidTestImplementation 'org.mockito:mockito-core:2.8.9' + androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' + androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' + testImplementation 'junit:junit:4.12' + testImplementation "org.robolectric:robolectric:3.2" + testImplementation "org.robolectric:shadows-multidex:3.1" } publish {