Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'TwidereProject/develop' into develop

This commit is contained in:
Mariotaku Lee 2017-04-26 01:56:11 +08:00
parent cc80423466 3649438836
commit f165fbc08f
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -9,12 +9,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath('fr.avianey.androidsvgdrawable:gradle-plugin:3.0.0') {
// should be excluded to avoid conflict
exclude group: 'xerces'
}
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }

5
twidere/build.gradle
View File

@ -23,10 +23,15 @@ buildscript {
// START Non-FOSS component // START Non-FOSS component
classpath "io.fabric.tools:gradle:${libVersions['FabricPlugin']}" classpath "io.fabric.tools:gradle:${libVersions['FabricPlugin']}"
classpath "com.github.triplet.gradle:play-publisher:${libVersions['PlayPublisher']}" classpath "com.github.triplet.gradle:play-publisher:${libVersions['PlayPublisher']}"
classpath 'com.google.gms:google-services:3.0.0'
// END Non-FOSS component // END Non-FOSS component
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${libVersions['Kotlin']}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${libVersions['Kotlin']}"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:${libVersions['Kotlin']}" classpath "org.jetbrains.kotlin:kotlin-android-extensions:${libVersions['Kotlin']}"
classpath('fr.avianey.androidsvgdrawable:gradle-plugin:3.0.0') {
// should be excluded to avoid conflict
exclude group: 'xerces'
}
} }
} }