Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

SV gradle update: app/build.gradle

Created 7 years agoDiff never expires

8 removals

183 lines

18 additions

192 lines

buildscript {

repositories {

maven { url 'https://maven.fabric.io/public' }

}

dependencies {

classpath 'io.fabric.tools:gradle:1.+'

}

apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'io.fabric'

repositories {

maven { url 'https://maven.fabric.io/public' }

mavenCentral()

}

apply plugin: 'android-apt'

apply plugin: 'realm-android'

apply plugin: 'me.tatarka.retrolambda'

android {

compileSdkVersion 25

buildToolsVersion "25.0.1"

buildToolsVersion '25.0.3'

defaultConfig {

applicationId "com.example.myapp"

minSdkVersion 21

targetSdkVersion 25

versionCode 1

versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

multiDexEnabled true

}

buildTypes {

release {

minifyEnabled false

proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

}

// Build type when we are generating build for clients, so it should be pretty stable

// build, properly tested (through the tests build type)

release {

debuggable true

}

// Build type used locally (on development)

debug {

applicationIdSuffix '.devel'

versionNameSuffix '-DEVEL'

debuggable true

testCoverageEnabled true

}

dataBinding {

enabled = true

}

compileOptions {

sourceCompatibility JavaVersion.VERSION_1_8

targetCompatibility JavaVersion.VERSION_1_8

}

packagingOptions {

// prevents duplicate file error when building APK,

// (started occurring after 'com.google.android.gms' version update)

exclude 'META-INF/rxjava.properties'

}

// prevents a gradle version conflict

// https://stackoverflow.com/questions/37347326/errorconflict-with-dependency-com-google-code-findbugsjsr305

configurations.all {

resolutionStrategy.force 'com.google.code.findbugs:jsr305:3.0.1'

}

dependencies {

compile fileTree(dir: 'libs', include: ['*.jar'])

androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {

exclude group: 'com.android.support', module: 'support-annotations'

})

androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2') {

// Necessary to avoid version conflicts

exclude group: 'com.android.support', module: 'appcompat'

exclude group: 'com.android.support', module: 'support-v4'

exclude group: 'com.android.support', module: 'support-annotations'

exclude module: 'recyclerview-v7'

}

// firebase

compile 'com.google.firebase:firebase-core:11.0.0'

compile 'com.google.firebase:firebase-messaging:11.0.0'

// Caligraphy dependency, allowing us to use custom fonts in the application

compile 'uk.co.chrisjenx:calligraphy:2.2.0'

testCompile 'junit:junit:4.12'

// ButterKnife library

compile 'com.jakewharton:butterknife:8.4.0'

compile 'com.jakewharton:butterknife:8.7.0'

annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'

apt 'com.jakewharton:butterknife-compiler:8.4.0'

compile supportDependencies.appCompat

compile supportDependencies.design

compile supportDependencies.recyclerView

compile supportDependencies.cardView

compile supportDependencies.palette

compile supportDependencies.supportAnnotation

compile supportDependencies.percent

compile retrofitDependencies.retrofit

compile retrofitDependencies.gson

compile retrofitDependencies.rxAdapterJava

compile rxDependencies.rxAndroid

compile glide

compile butterknife

compile autoValueGson

testCompile testingDependencies.junit

testCompile testingDependencies.mockito

testCompile testingDependencies.robolectric

testCompile "org.robolectric:shadows-multidex:3.3.1"

testCompile 'org.robolectric:shadows-play-services:3.3.1'

testCompile 'org.powermock:powermock-core:1.6.5'

testCompile 'org.powermock:powermock-module-junit4:1.6.5'

testCompile 'org.powermock:powermock-module-junit4-rule:1.6.5'

testCompile 'org.powermock:powermock-api-mockito:1.6.5'

testCompile 'org.powermock:powermock-classloading-xstream:1.6.5'

testProvided 'com.google.dagger:dagger-compiler:2.5'

compile 'com.google.android.gms:play-services-places:11.0.0'

compile 'com.seatgeek:placesautocomplete:0.2-SNAPSHOT'

compile 'com.android.support:multidex:1.0.0'

compile "com.google.dagger:dagger:2.9"

apt "com.google.dagger:dagger-compiler:2.9"

// dagger

compile 'com.google.dagger:dagger-android:2.11'

compile 'com.google.dagger:dagger-android-support:2.11' // if you use the support libraries

annotationProcessor 'com.google.dagger:dagger-android-processor:2.11'

provided 'javax.annotation:jsr250-api:1.0'

testCompile "org.assertj:assertj-core:2.5.0"

compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'

compile 'com.facebook.android:facebook-android-sdk:4.+'

// Dependency for using circle view on Glide

compile 'jp.wasabeef:glide-transformations:2.0.1'

compile 'com.aurelhubert:ahbottomnavigation:2.0.4'

compile 'com.github.florent37:camerafragment:1.0.1'

compile 'com.karumi:dexter:3.0.2'

// TODO use only the ExoPlayer modules we need, not the whole package

// see https://google.github.io/ExoPlayer/guide.html

compile 'com.google.android.exoplayer:exoplayer:r2.4.2'

compile 'com.github.stfalcon:contentmanager:0.4.3'

compile 'org.greenrobot:eventbus:3.0.0'

// color picker

compile 'com.github.QuadFlask:colorpicker:0.0.12'

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'

compile 'com.github.ronaldsmartin:Material-ViewPagerIndicator:1.0.2'

compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.14'

compile 'de.hdodenhof:circleimageview:2.1.0'

compile 'com.github.deano2390:MaterialShowcaseView:1.1.0'

// Hashtags view - for the profile interests

compile 'com.github.greenfrvr:hashtag-view:1.2.1'

compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {

transitive = true;

}

compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"

}

apply plugin: 'com.google.gms.google-services'

Saved diffs

Original text

Open file

buildscript {
    repositories {
        maven { url 'https://maven.fabric.io/public' }
    }

dependencies {
        classpath 'io.fabric.tools:gradle:1.+'
    }
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'io.fabric'
repositories {
    maven { url 'https://maven.fabric.io/public' }
    mavenCentral()
}

apply plugin: 'android-apt'
apply plugin: 'realm-android'
apply plugin: 'me.tatarka.retrolambda'
android {

compileSdkVersion 25
    buildToolsVersion "25.0.1"
    defaultConfig {
        applicationId "com.example.myapp"
        minSdkVersion 21
        targetSdkVersion 25
        versionCode 1
        versionName "1.0"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        multiDexEnabled true
    }

buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }

// Build type when we are generating build for clients, so it should be pretty stable
        // build, properly tested (through the tests build type)
        release {
            debuggable true
        }

// Build type used locally (on development)
        debug {
            applicationIdSuffix '.devel'
            versionNameSuffix '-DEVEL'
            debuggable true
            testCoverageEnabled true
        }
    }

dataBinding {
        enabled = true
    }

compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }

packagingOptions {
        // prevents duplicate file error when building APK,
        // (started occurring after 'com.google.android.gms' version update)
        exclude 'META-INF/rxjava.properties'
    }

}

dependencies {
    compile fileTree(dir: 'libs', include: ['*.jar'])
    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
        exclude group: 'com.android.support', module: 'support-annotations'
    })

androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2') {
        // Necessary to avoid version conflicts
        exclude group: 'com.android.support', module: 'appcompat'
        exclude group: 'com.android.support', module: 'support-v4'
        exclude group: 'com.android.support', module: 'support-annotations'
        exclude module: 'recyclerview-v7'
    }

// firebase
    compile 'com.google.firebase:firebase-core:11.0.0'
    compile 'com.google.firebase:firebase-messaging:11.0.0'

// Caligraphy dependency, allowing us to use custom fonts in the application
    compile 'uk.co.chrisjenx:calligraphy:2.2.0'

testCompile 'junit:junit:4.12'

// ButterKnife library
    compile 'com.jakewharton:butterknife:8.4.0'

apt 'com.jakewharton:butterknife-compiler:8.4.0'

compile supportDependencies.appCompat
    compile supportDependencies.design
    compile supportDependencies.recyclerView
    compile supportDependencies.cardView
    compile supportDependencies.palette
    compile supportDependencies.supportAnnotation
    compile supportDependencies.percent

compile retrofitDependencies.retrofit
    compile retrofitDependencies.gson
    compile retrofitDependencies.rxAdapterJava

compile rxDependencies.rxAndroid
    compile glide
    compile butterknife
    compile autoValueGson

testCompile testingDependencies.junit
    testCompile testingDependencies.mockito
    testCompile testingDependencies.robolectric
    testCompile "org.robolectric:shadows-multidex:3.3.1"
    testCompile 'org.robolectric:shadows-play-services:3.3.1'

testCompile 'org.powermock:powermock-core:1.6.5'
    testCompile 'org.powermock:powermock-module-junit4:1.6.5'
    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.5'
    testCompile 'org.powermock:powermock-api-mockito:1.6.5'
    testCompile 'org.powermock:powermock-classloading-xstream:1.6.5'
    testProvided 'com.google.dagger:dagger-compiler:2.5'

compile 'com.google.android.gms:play-services-places:11.0.0'
    compile 'com.seatgeek:placesautocomplete:0.2-SNAPSHOT'

compile 'com.android.support:multidex:1.0.0'
    compile "com.google.dagger:dagger:2.9"
    apt "com.google.dagger:dagger-compiler:2.9"
    provided 'javax.annotation:jsr250-api:1.0'

testCompile "org.assertj:assertj-core:2.5.0"

compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'

compile 'com.facebook.android:facebook-android-sdk:4.+'

// Dependency for using circle view on Glide
    compile 'jp.wasabeef:glide-transformations:2.0.1'

compile 'com.aurelhubert:ahbottomnavigation:2.0.4'
    compile 'com.github.florent37:camerafragment:1.0.1'

compile 'com.karumi:dexter:3.0.2'

// TODO use only the ExoPlayer modules we need, not the whole package
    // see https://google.github.io/ExoPlayer/guide.html
    compile 'com.google.android.exoplayer:exoplayer:r2.4.2'

compile 'com.github.stfalcon:contentmanager:0.4.3'

compile 'org.greenrobot:eventbus:3.0.0'

// color picker
    compile 'com.github.QuadFlask:colorpicker:0.0.12'

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'

compile 'com.github.ronaldsmartin:Material-ViewPagerIndicator:1.0.2'
    compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.14'

compile 'de.hdodenhof:circleimageview:2.1.0'
    compile 'com.github.deano2390:MaterialShowcaseView:1.1.0'

// Hashtags view - for the profile interests
    compile 'com.github.greenfrvr:hashtag-view:1.2.1'
    compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
        transitive = true;
    }
    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
}

apply plugin: 'com.google.gms.google-services'

Changed text

Open file

buildscript {
    repositories {
        maven { url 'https://maven.fabric.io/public' }
    }
    dependencies {
        classpath 'io.fabric.tools:gradle:1.+'
    }
}

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'io.fabric'
repositories {
    maven { url 'https://maven.fabric.io/public' }
    mavenCentral()
}

apply plugin: 'realm-android'
apply plugin: 'me.tatarka.retrolambda'
android {

compileSdkVersion 25
    buildToolsVersion '25.0.3'
    defaultConfig {
        applicationId "com.example.myapp"
        minSdkVersion 21
        targetSdkVersion 25
        versionCode 1
        versionName "1.0"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        multiDexEnabled true
    }

buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }

dataBinding {
        enabled = true
    }

compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }

// prevents a gradle version conflict
    // https://stackoverflow.com/questions/37347326/errorconflict-with-dependency-com-google-code-findbugsjsr305
    configurations.all {
        resolutionStrategy.force 'com.google.code.findbugs:jsr305:3.0.1'
    }

}

dependencies {

compile fileTree(dir: 'libs', include: ['*.jar'])
    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
        exclude group: 'com.android.support', module: 'support-annotations'
    })

// firebase
    compile 'com.google.firebase:firebase-core:11.0.0'
    compile 'com.google.firebase:firebase-messaging:11.0.0'

// Caligraphy dependency, allowing us to use custom fonts in the application
    compile 'uk.co.chrisjenx:calligraphy:2.2.0'

testCompile 'junit:junit:4.12'

// ButterKnife library
    compile 'com.jakewharton:butterknife:8.7.0'
    annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'

compile retrofitDependencies.retrofit
    compile retrofitDependencies.gson
    compile retrofitDependencies.rxAdapterJava

compile rxDependencies.rxAndroid
    compile glide
    compile butterknife
    compile autoValueGson

compile 'com.google.android.gms:play-services-places:11.0.0'
    compile 'com.seatgeek:placesautocomplete:0.2-SNAPSHOT'

compile 'com.android.support:multidex:1.0.0'

// dagger
    compile 'com.google.dagger:dagger-android:2.11'
    compile 'com.google.dagger:dagger-android-support:2.11' // if you use the support libraries
    annotationProcessor 'com.google.dagger:dagger-android-processor:2.11'

provided 'javax.annotation:jsr250-api:1.0'

testCompile "org.assertj:assertj-core:2.5.0"

compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'

compile 'com.facebook.android:facebook-android-sdk:4.+'

// Dependency for using circle view on Glide
    compile 'jp.wasabeef:glide-transformations:2.0.1'

compile 'com.aurelhubert:ahbottomnavigation:2.0.4'
    compile 'com.github.florent37:camerafragment:1.0.1'

compile 'com.karumi:dexter:3.0.2'

// TODO use only the ExoPlayer modules we need, not the whole package
    // see https://google.github.io/ExoPlayer/guide.html
    compile 'com.google.android.exoplayer:exoplayer:r2.4.2'

compile 'com.github.stfalcon:contentmanager:0.4.3'

compile 'org.greenrobot:eventbus:3.0.0'

// color picker
    compile 'com.github.QuadFlask:colorpicker:0.0.12'

compile 'com.github.ronaldsmartin:Material-ViewPagerIndicator:1.0.2'
    compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.14'

compile 'de.hdodenhof:circleimageview:2.1.0'
    compile 'com.github.deano2390:MaterialShowcaseView:1.1.0'

apply plugin: 'com.google.gms.google-services'