Repository: incubator-taverna-mobile Updated Branches: refs/heads/master 2e4a4e96e -> 89364c294
update dependencies and gradle version Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/b09c403d Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b09c403d Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b09c403d Branch: refs/heads/master Commit: b09c403d56bb362602478de7219dde8d00008f0d Parents: e4b58a7 Author: Sagar <[email protected]> Authored: Fri Jan 26 18:46:12 2018 +0530 Committer: Sagar <[email protected]> Committed: Fri Jan 26 18:46:12 2018 +0530 ---------------------------------------------------------------------- app/build.gradle | 84 ++++++++++++++------------- build.gradle | 26 ++++++++- gradle/wrapper/gradle-wrapper.properties | 4 +- 3 files changed, 71 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b09c403d/app/build.gradle ---------------------------------------------------------------------- diff --git a/app/build.gradle b/app/build.gradle index 198c8cb..0bf40b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,19 +1,19 @@ apply plugin: 'com.android.application' -apply plugin: 'com.neenbedankt.android-apt' +apply plugin: 'com.jakewharton.butterknife' apply from: '../config/quality/quality.gradle' android { - compileSdkVersion 23 - buildToolsVersion "21.1.2" + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion useLibrary 'org.apache.http.legacy' lintOptions { abortOnError false } defaultConfig { - applicationId "mobile.taverna.apache.org.tavernamobile" - minSdkVersion 17 - targetSdkVersion 21 + applicationId "org.apache.taverna.mobile" + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" multiDexEnabled true @@ -56,34 +56,39 @@ repositories { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.3.0' - compile 'com.android.support:cardview-v7:23.3.0' - compile 'com.android.support:recyclerview-v7:23.3.0' - compile 'com.android.support:support-v4:23.3.0' - - compile 'com.android.support:design:23.3.0' - compile 'com.android.support:preference-v7:23.3.0' - compile 'com.android.support:preference-v14:23.3.0' - - compile 'com.squareup.retrofit2:retrofit:2.0.2' - compile "com.squareup.retrofit2:adapter-rxjava:2.0.2" - compile 'com.squareup.okhttp3:logging-interceptor:3.2.0' - - compile('com.squareup.retrofit2:converter-simplexml:2.0.2') { + //Dependencies for support library + compile "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion" + compile "com.android.support:cardview-v7:$rootProject.supportLibraryVersion" + compile "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion" + compile "com.android.support:support-v4:$rootProject.supportLibraryVersion" + + compile "com.android.support:design:$rootProject.supportLibraryVersion" + compile "com.android.support:preference-v7:$rootProject.supportLibraryVersion" + compile "com.android.support:preference-v14:$rootProject.supportLibraryVersion" + + //Dependencies for retofit and okhhtp3 + compile "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersionLatest" + compile "com.squareup.retrofit2:adapter-rxjava:$rootProject.retrofitVersionLatest" + compile "com.squareup.okhttp3:logging-interceptor:$rootProject.okHttp3Version" + compile "com.squareup.retrofit2:converter-gson:$rootProject.retrofitVersionLatest" + + compile("com.squareup.retrofit2:converter-simplexml:$rootProject.retrofitVersionLatest") { exclude group: 'xpp3', module: 'xpp3' exclude group: 'stax', module: 'stax-api' exclude group: 'stax', module: 'stax' } - compile 'com.jakewharton:butterknife:8.0.1' - apt 'com.jakewharton:butterknife-compiler:8.0.1' + //Dependencies for butterknife + compile "com.jakewharton:butterknife:$rootProject.butterKnifeVersion" + annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion" - compile 'io.reactivex:rxandroid:1.2.0' + + compile "io.reactivex:rxandroid:1.2.0" // Because RxAndroid releases are few and far between, it is recommended you also // explicitly depend on RxJava's latest version for bug fixes and new features. - compile 'io.reactivex:rxjava:1.1.5' + compile "io.reactivex:rxjava:1.1.5" - compile('org.simpleframework:simple-xml:2.7.+'){ + compile("org.simpleframework:simple-xml:2.7.+") { exclude module: 'stax' exclude module: 'stax-api' exclude module: 'xpp3' @@ -92,25 +97,26 @@ dependencies { compile 'com.github.bumptech.glide:glide:3.6.0' compile 'com.caverock:androidsvg:1.2.1' + //Dependencies for dbflow + annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:$rootProject.raizLabsDBFlow" + compile "com.github.Raizlabs.DBFlow:dbflow-core:$rootProject.raizLabsDBFlow" + compile "com.github.Raizlabs.DBFlow:dbflow:$rootProject.raizLabsDBFlow" - apt "com.github.Raizlabs.DBFlow:dbflow-processor:3.0.1" - compile "com.github.Raizlabs.DBFlow:dbflow-core:3.0.1" - compile "com.github.Raizlabs.DBFlow:dbflow:3.0.1" - - compile 'com.facebook.stetho:stetho:1.3.1' - compile 'com.facebook.stetho:stetho-okhttp3:1.3.1' + //Dependencies for db debug + compile "com.facebook.stetho:stetho:$rootProject.stetho" + compile "com.facebook.stetho:stetho-okhttp3:$rootProject.stetho" - compile 'com.github.chrisbanes:PhotoView:1.2.6' - compile 'com.android.support:multidex:1.0.0' - compile 'com.google.code.gson:gson:2.7' - compile 'com.squareup.retrofit2:converter-gson:2.0.2' + //Dependencies for Image zoom + compile "com.github.chrisbanes:PhotoView:1.2.6" + compile "com.android.support:multidex:1.0.2" + compile "com.google.code.gson:gson:2.8.2" - compile 'com.anton46:stepsview:0.0.2' + compile "com.anton46:stepsview:0.0.2" //Dependencies for LeakCanary - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' - testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1' + debugCompile "com.squareup.leakcanary:leakcanary-android:$rootProject.leakcanary" + releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:$rootProject.leakcanary" + testCompile "com.squareup.leakcanary:leakcanary-android-no-op:$rootProject.leakcanary" //Dependencies for JUNit and unit tests. testCompile "junit:junit:4.12" http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b09c403d/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 05c632e..f846b55 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,14 @@ buildscript { repositories { + google() jcenter() maven { url "https://plugins.gradle.org/m2/"; } + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-20171223.061039-23' classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.1" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -16,8 +18,10 @@ buildscript { allprojects { repositories { + google() jcenter() maven { url "https://www.jitpack.io"; } + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } } } apply plugin: "org.nosphere.apache.rat" @@ -25,3 +29,21 @@ rat { inputDir='app/src' plainOutput = true } + + +ext { + // Sdk and tools + minSdkVersion = 17 + targetSdkVersion = 26 + compileSdkVersion = 26 + buildToolsVersion = '26.0.2' + + // App dependencies + supportLibraryVersion = '26.1.0' + raizLabsDBFlow = '3.1.1' + retrofitVersionLatest = '2.3.0' + okHttp3Version = '3.9.1' + butterKnifeVersion = '8.8.1' + stetho='1.5.0' + leakcanary ='1.5.4' +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b09c403d/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4434cc8..6467d51 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Oct 04 12:19:02 BST 2016 +#Fri Jan 26 17:10:21 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
