diff --git a/build.gradle b/build.gradle index bb279aa0a..9b4d69f4f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,12 @@ -apply plugin: 'com.github.ben-manes.versions' - // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { jcenter() maven { url 'https://plugins.gradle.org/m2/' } + maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0' - classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.android.tools.build:gradle:3.0.0-beta2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -44,12 +41,13 @@ subprojects { ] libVersions = [ Kotlin : '1.1.3-2', - SupportLib : '26.0.0', + SupportLib : '26.0.1', + SupportTest : '1.0.0', MariotakuCommons : '0.9.15', RestFu : '0.9.57', ObjectCursor : '0.9.20', PlayServices : '11.0.4', - MapsUtils : '0.4.4', + MapsUtils : '0.5', Crashlyrics : '2.6.8', DropboxCoreSdk : '3.0.3', GoogleDriveApi : 'v3-rev61-1.22.0', @@ -75,8 +73,8 @@ subprojects { SQLiteQB : '0.9.15', Glide : '3.7.0', GlideOkHttp3 : '1.4.0', - GlideTransformations : '2.0.1', - AndroidImageCropper : '2.4.0', + GlideTransformations : '2.0.2', + AndroidImageCropper : '2.4.6', ExportablePreferences: '0.9.6', ACRA : '4.9.2', AbstractTask : '0.9.5', diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b63939e2b..970fc87a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 05 00:00:03 CST 2017 +#Sun Aug 13 19:49:14 CST 2017 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.1-rc-1-all.zip diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index 50b777aac..c77d6cda1 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -20,7 +20,6 @@ */ apply plugin: 'com.android.library' -apply plugin: 'com.neenbedankt.android-apt' apply plugin: 'com.jfrog.bintray' apply plugin: 'com.github.dcendents.android-maven' @@ -47,7 +46,7 @@ buildscript { android { defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 26 versionCode projectVersionCode versionName projectVersionName } @@ -65,20 +64,21 @@ repositories { } dependencies { - apt "com.bluelinelabs:logansquare-compiler:${libVersions['LoganSquare']}" - apt 'com.hannesdorfmann.parcelableplease:processor:1.0.2' - apt "com.github.mariotaku.ObjectCursor:processor:${libVersions['ObjectCursor']}" - apt "com.github.mariotaku.ExportablePreferences:processor:${libVersions['ExportablePreferences']}" - compile "com.android.support:support-annotations:${libVersions['SupportLib']}" - compile "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}" - compile "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}" - compile "com.github.mariotaku.RestFu:oauth:${libVersions['RestFu']}" - compile "com.github.mariotaku.RestFu:oauth2:${libVersions['RestFu']}" - compile 'com.hannesdorfmann.parcelableplease:annotation:1.0.2' - compile "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}" - compile "com.github.mariotaku.ExportablePreferences:core:${libVersions['ExportablePreferences']}" - compile "com.github.mariotaku.CommonsLibrary:objectcursor:${libVersions['MariotakuCommons']}" - compile "com.github.mariotaku.CommonsLibrary:logansquare:${libVersions['MariotakuCommons']}" + annotationProcessor "com.bluelinelabs:logansquare-compiler:${libVersions['LoganSquare']}" + annotationProcessor "com.hannesdorfmann.parcelableplease:processor:${libVersions['ParcelablePlease']}" + annotationProcessor "com.github.mariotaku.ObjectCursor:processor:${libVersions['ObjectCursor']}" + annotationProcessor "com.github.mariotaku.ExportablePreferences:processor:${libVersions['ExportablePreferences']}" + + api "com.android.support:support-annotations:${libVersions['SupportLib']}" + api "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}" + api "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}" + api "com.github.mariotaku.RestFu:oauth:${libVersions['RestFu']}" + api "com.github.mariotaku.RestFu:oauth2:${libVersions['RestFu']}" + api "com.hannesdorfmann.parcelableplease:annotation:${libVersions['ParcelablePlease']}" + api "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}" + api "com.github.mariotaku.ExportablePreferences:core:${libVersions['ExportablePreferences']}" + api "com.github.mariotaku.CommonsLibrary:objectcursor:${libVersions['MariotakuCommons']}" + api "com.github.mariotaku.CommonsLibrary:logansquare:${libVersions['MariotakuCommons']}" } install { diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index 8e9f3a2ff..2cfd0efb6 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.android.library' android { defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -37,5 +37,5 @@ android { } dependencies { - compile "com.android.support:support-compat:${libVersions['SupportLib']}" + api "com.android.support:support-compat:${libVersions['SupportLib']}" } diff --git a/twidere.wear/build.gradle b/twidere.wear/build.gradle index 20b20d090..09ef9b6c5 100644 --- a/twidere.wear/build.gradle +++ b/twidere.wear/build.gradle @@ -23,7 +23,7 @@ android { defaultConfig { applicationId "org.mariotaku.twidere" minSdkVersion 20 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" multiDexEnabled true @@ -37,7 +37,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.google.android.support:wearable:2.0.0' - compile "com.google.android.gms:play-services-wearable:${libVersions['PlayServices']}" + compileOnly 'com.google.android.wearable:wearable:2.0.4' + implementation 'com.google.android.support:wearable:2.0.4' + implementation "com.google.android.gms:play-services-wearable:${libVersions['PlayServices']}" } diff --git a/twidere/build.gradle b/twidere/build.gradle index f17088089..636fbf780 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -49,11 +49,17 @@ android { additionalParameters "--no-version-vectors" } + flavorDimensions 'channel' + productFlavors { // START Non-FOSS component - google {} + google { + dimension 'channel' + } // END Non-FOSS component - fdroid {} + fdroid { + dimension 'channel' + } } buildTypes { debug { @@ -89,113 +95,116 @@ dependencies { // wearApp project(':twidere.wear') kapt "com.bluelinelabs:logansquare-compiler:${libVersions['LoganSquare']}" kapt "com.hannesdorfmann.parcelableplease:processor:${libVersions['ParcelablePlease']}" - kapt 'com.google.dagger:dagger-compiler:2.8' + kapt 'com.google.dagger:dagger-compiler:2.11' kapt "com.github.mariotaku.ObjectCursor:processor:${libVersions['ObjectCursor']}" - compile project(':twidere.component.common') - compile project(':twidere.component.nyan') + implementation project(':twidere.component.common') + implementation project(':twidere.component.nyan') // START Non-FOSS component - googleCompile "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}" - googleCompile "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}" - googleCompile "com.google.maps.android:android-maps-utils:${libVersions['MapsUtils']}" - googleCompile "com.anjlab.android.iab.v3:library:${libVersions['IABv3']}" - googleCompile "com.dropbox.core:dropbox-core-sdk:${libVersions['DropboxCoreSdk']}" - googleCompile("com.google.apis:google-api-services-drive:${libVersions['GoogleDriveApi']}") { + googleImplementation "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}" + googleImplementation "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}" + googleImplementation "com.google.maps.android:android-maps-utils:${libVersions['MapsUtils']}" + googleImplementation "com.anjlab.android.iab.v3:library:${libVersions['IABv3']}" + googleImplementation "com.dropbox.core:dropbox-core-sdk:${libVersions['DropboxCoreSdk']}" + googleImplementation("com.google.apis:google-api-services-drive:${libVersions['GoogleDriveApi']}") { exclude group: 'org.apache.httpcomponents' } // END Non-FOSS component - fdroidCompile "org.osmdroid:osmdroid-android:${libVersions['OSMDroid']}" - fdroidCompile "ch.acra:acra:${libVersions['ACRA']}" + fdroidImplementation "org.osmdroid:osmdroid-android:${libVersions['OSMDroid']}" + fdroidImplementation "ch.acra:acra:${libVersions['ACRA']}" - debugCompile "com.facebook.stetho:stetho:${libVersions['Stetho']}" - debugCompile "com.facebook.stetho:stetho-okhttp3:${libVersions['Stetho']}" - debugCompile "com.facebook.stetho:stetho-js-rhino:${libVersions['Stetho']}" - debugCompile "com.squareup.leakcanary:leakcanary-android:${libVersions['LeakCanary']}" - debugCompile('com.jayway.jsonpath:json-path:2.2.0') { + debugImplementation "com.facebook.stetho:stetho:${libVersions['Stetho']}" + debugImplementation "com.facebook.stetho:stetho-okhttp3:${libVersions['Stetho']}" + debugImplementation "com.facebook.stetho:stetho-js-rhino:${libVersions['Stetho']}" + debugImplementation "com.squareup.leakcanary:leakcanary-android:${libVersions['LeakCanary']}" + debugImplementation('com.jayway.jsonpath:json-path:2.2.0') { exclude group: 'net.minidev', module: 'json-smart' } + // Stetho dependency, see https://g.co/androidstudio/app-test-app-conflict + debugImplementation "com.google.code.findbugs:jsr305:3.0.1" - provided 'javax.annotation:jsr250-api:1.0' + compileOnly 'javax.annotation:jsr250-api:1.0' - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' - androidTestCompile "com.android.support:support-annotations:${libVersions['SupportLib']}" - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' + androidTestImplementation "com.android.support:support-annotations:${libVersions['SupportLib']}" + androidTestImplementation "com.android.support.test:runner:${libVersions['SupportTest']}" + androidTestImplementation "com.android.support.test:rules:${libVersions['SupportTest']}" + // https://g.co/androidstudio/app-test-app-conflict + androidTestImplementation "com.google.code.findbugs:jsr305:3.0.1" - compile 'com.android.support:multidex:1.0.1' - compile "com.android.support:support-annotations:${libVersions['SupportLib']}" - compile "com.android.support:support-compat:${libVersions['SupportLib']}" - compile "com.android.support:support-core-utils:${libVersions['SupportLib']}" - compile "com.android.support:support-core-ui:${libVersions['SupportLib']}" - compile "com.android.support:support-v13:${libVersions['SupportLib']}" - compile "com.android.support:appcompat-v7:${libVersions['SupportLib']}" - compile "com.android.support:cardview-v7:${libVersions['SupportLib']}" - compile "com.android.support:recyclerview-v7:${libVersions['SupportLib']}" - compile "com.android.support:preference-v7:${libVersions['SupportLib']}" - compile "com.android.support:preference-v14:${libVersions['SupportLib']}" - compile "com.android.support:palette-v7:${libVersions['SupportLib']}" - compile "com.android.support:customtabs:${libVersions['SupportLib']}" - compile "com.android.support:design:${libVersions['SupportLib']}" - compile "com.android.support:exifinterface:${libVersions['SupportLib']}" - compile "com.twitter:twitter-text:${libVersions['TwitterText']}" - compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' - compile 'com.squareup:otto:1.3.8' - compile 'dnsjava:dnsjava:2.1.8' - compile 'com.commonsware.cwac:layouts:0.4.3' - compile 'com.rengwuxian.materialedittext:library:2.1.4' - compile 'com.pnikosis:materialish-progress:1.7' - compile 'com.github.mariotaku:MessageBubbleView:1.6' - compile 'com.github.mariotaku:DragSortListView:0.6.1' - compile 'com.github.uucky:ColorPicker-Android:0.9.7@aar' - compile "pl.droidsonroids.gif:android-gif-drawable:${libVersions['AndroidGIFDrawable']}" - compile 'com.sprylab.android.texturevideoview:texturevideoview:1.2.1' - compile 'com.squareup:pollexor:2.0.4' - compile 'org.apache.commons:commons-lang3:3.5' - compile 'commons-primitives:commons-primitives:1.0' - compile "org.apache.james:apache-mime4j-core:${libVersions['Mime4J']}" - compile "org.apache.james:apache-mime4j-storage:${libVersions['Mime4J']}" - compile "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}" - compile "com.hannesdorfmann.parcelableplease:annotation:${libVersions['ParcelablePlease']}" - compile "com.github.mariotaku:PickNCrop:${libVersions['PickNCrop']}" - compile "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}" - compile "com.github.mariotaku.RestFu:okhttp3:${libVersions['RestFu']}" - compile "com.github.mariotaku.RestFu:logansquare:${libVersions['RestFu']}" - compile "com.squareup.okhttp3:okhttp:${libVersions['OkHttp']}" - compile 'com.lnikkila:extendedtouchview:0.1.0' - compile 'com.google.dagger:dagger:2.8' - compile 'org.attoparser:attoparser:2.0.3.RELEASE' - compile 'com.getkeepsafe.taptargetview:taptargetview:1.8.0' - compile 'net.ypresto.androidtranscoder:android-transcoder:0.2.0' - compile "com.google.android.exoplayer:exoplayer:${libVersions['Exoplayer']}" - compile "com.google.android.exoplayer:extension-okhttp:${libVersions['Exoplayer']}" - compile "com.github.bumptech.glide:glide:${libVersions['Glide']}" - compile "com.github.bumptech.glide:okhttp3-integration:${libVersions['GlideOkHttp3']}@aar" - compile "jp.wasabeef:glide-transformations:${libVersions['GlideTransformations']}" - compile "com.theartofdev.edmodo:android-image-cropper:${libVersions['AndroidImageCropper']}" + implementation 'com.android.support:multidex:1.0.2' + implementation "com.android.support:support-annotations:${libVersions['SupportLib']}" + implementation "com.android.support:support-compat:${libVersions['SupportLib']}" + implementation "com.android.support:support-core-utils:${libVersions['SupportLib']}" + implementation "com.android.support:support-core-ui:${libVersions['SupportLib']}" + implementation "com.android.support:support-v13:${libVersions['SupportLib']}" + implementation "com.android.support:appcompat-v7:${libVersions['SupportLib']}" + implementation "com.android.support:cardview-v7:${libVersions['SupportLib']}" + implementation "com.android.support:recyclerview-v7:${libVersions['SupportLib']}" + implementation "com.android.support:palette-v7:${libVersions['SupportLib']}" + implementation "com.android.support:preference-v14:${libVersions['SupportLib']}" + implementation "com.android.support:customtabs:${libVersions['SupportLib']}" + implementation "com.android.support:design:${libVersions['SupportLib']}" + implementation "com.android.support:exifinterface:${libVersions['SupportLib']}" + implementation "com.twitter:twitter-text:${libVersions['TwitterText']}" + implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' + implementation 'com.squareup:otto:1.3.8' + implementation 'dnsjava:dnsjava:2.1.8' + implementation 'com.commonsware.cwac:layouts:0.4.3' + implementation 'com.rengwuxian.materialedittext:library:2.1.4' + implementation 'com.pnikosis:materialish-progress:1.7' + implementation 'com.github.mariotaku:MessageBubbleView:1.6' + implementation 'com.github.mariotaku:DragSortListView:0.6.1' + implementation 'com.github.uucky:ColorPicker-Android:0.9.7@aar' + implementation "pl.droidsonroids.gif:android-gif-drawable:${libVersions['AndroidGIFDrawable']}" + implementation 'com.sprylab.android.texturevideoview:texturevideoview:1.2.1' + implementation 'com.squareup:pollexor:2.0.4' + implementation 'org.apache.commons:commons-lang3:3.6' + implementation 'commons-primitives:commons-primitives:1.0' + implementation "org.apache.james:apache-mime4j-core:${libVersions['Mime4J']}" + implementation "org.apache.james:apache-mime4j-storage:${libVersions['Mime4J']}" + implementation "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}" + implementation "com.hannesdorfmann.parcelableplease:annotation:${libVersions['ParcelablePlease']}" + implementation "com.github.mariotaku:PickNCrop:${libVersions['PickNCrop']}" + implementation "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}" + implementation "com.github.mariotaku.RestFu:okhttp3:${libVersions['RestFu']}" + implementation "com.github.mariotaku.RestFu:logansquare:${libVersions['RestFu']}" + implementation "com.squareup.okhttp3:okhttp:${libVersions['OkHttp']}" + implementation 'com.lnikkila:extendedtouchview:0.1.1' + implementation 'com.google.dagger:dagger:2.11' + implementation 'org.attoparser:attoparser:2.0.4.RELEASE' + implementation 'com.getkeepsafe.taptargetview:taptargetview:1.9.1' + implementation 'net.ypresto.androidtranscoder:android-transcoder:0.2.0' + implementation "com.google.android.exoplayer:exoplayer:${libVersions['Exoplayer']}" + implementation "com.google.android.exoplayer:extension-okhttp:${libVersions['Exoplayer']}" + implementation "com.github.bumptech.glide:glide:${libVersions['Glide']}" + implementation "com.github.bumptech.glide:okhttp3-integration:${libVersions['GlideOkHttp3']}@aar" + implementation "jp.wasabeef:glide-transformations:${libVersions['GlideTransformations']}" + implementation "com.theartofdev.edmodo:android-image-cropper:${libVersions['AndroidImageCropper']}" - compile "com.github.mariotaku.MediaViewerLibrary:base:${libVersions['MediaViewerLibrary']}" - compile "com.github.mariotaku.MediaViewerLibrary:subsample-image-view:${libVersions['MediaViewerLibrary']}" - compile "com.github.mariotaku:SQLiteQB:${libVersions['SQLiteQB']}" - compile "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}" - compile "com.github.mariotaku.ExportablePreferences:core:${libVersions['ExportablePreferences']}" - compile "com.github.mariotaku:AbstractTask:${libVersions['AbstractTask']}" - compile "com.github.mariotaku.CommonsLibrary:parcel:${libVersions['MariotakuCommons']}" - compile "com.github.mariotaku.CommonsLibrary:io:${libVersions['MariotakuCommons']}" - compile "com.github.mariotaku.CommonsLibrary:text:${libVersions['MariotakuCommons']}" - compile "com.github.mariotaku.CommonsLibrary:text-kotlin:${libVersions['MariotakuCommons']}" - compile "com.github.mariotaku.CommonsLibrary:emojione:${libVersions['MariotakuCommons']}" - compile "com.github.mariotaku:KPreferences:${libVersions['KPreferences']}" - compile "com.github.mariotaku:Chameleon:${libVersions['Chameleon']}" - compile "com.github.mariotaku.UniqR:android:${libVersions['UniqR']}" + implementation "com.github.mariotaku.MediaViewerLibrary:base:${libVersions['MediaViewerLibrary']}" + implementation "com.github.mariotaku.MediaViewerLibrary:subsample-image-view:${libVersions['MediaViewerLibrary']}" + implementation "com.github.mariotaku:SQLiteQB:${libVersions['SQLiteQB']}" + implementation "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}" + implementation "com.github.mariotaku.ExportablePreferences:core:${libVersions['ExportablePreferences']}" + implementation "com.github.mariotaku:AbstractTask:${libVersions['AbstractTask']}" + implementation "com.github.mariotaku.CommonsLibrary:parcel:${libVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:io:${libVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:text:${libVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:text-kotlin:${libVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:emojione:${libVersions['MariotakuCommons']}" + implementation "com.github.mariotaku:KPreferences:${libVersions['KPreferences']}" + implementation "com.github.mariotaku:Chameleon:${libVersions['Chameleon']}" + implementation "com.github.mariotaku.UniqR:android:${libVersions['UniqR']}" - compile "org.jetbrains.kotlin:kotlin-stdlib:${libVersions['Kotlin']}" - compile "nl.komponents.kovenant:kovenant:${libVersions['Kovenant']}" - compile "nl.komponents.kovenant:kovenant-android:${libVersions['Kovenant']}" - compile "nl.komponents.kovenant:kovenant-functional:${libVersions['Kovenant']}" - compile "nl.komponents.kovenant:kovenant-combine:${libVersions['Kovenant']}" + implementation "org.jetbrains.kotlin:kotlin-stdlib:${libVersions['Kotlin']}" + implementation "nl.komponents.kovenant:kovenant:${libVersions['Kovenant']}" + implementation "nl.komponents.kovenant:kovenant-android:${libVersions['Kovenant']}" + implementation "nl.komponents.kovenant:kovenant-functional:${libVersions['Kovenant']}" + implementation "nl.komponents.kovenant:kovenant-combine:${libVersions['Kovenant']}" } task svgToDrawable(type: SvgDrawableTask) {