Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight gradle cleanup, plugin updates

Browse Source 
(cherry picked from commit 159146e1977fddb8e0e6da90c104cbc3cf81ab5a)

# Conflicts:
#	app/build.gradle
#	build.gradle.kts
This commit is contained in:
TacoTheDank 2020-08-10 22:49:46 -04:00 committed by Jobobby04
parent 309bd83730
commit 08d11914af
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/build.gradle
View File

@ -277,13 +277,12 @@ dependencies {
implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version" implementation "io.github.reactivecircus.flowbinding:flowbinding-viewpager:$flowbinding_version"
// Licenses // Licenses
final aboutlibraries_version = '8.3.0' // NOTE: REMEMBER TO UPDATE GRADLE PLUGIN
implementation "com.mikepenz:aboutlibraries-core:$aboutlibraries_version" implementation 'com.mikepenz:aboutlibraries:8.3.0'
implementation "com.mikepenz:aboutlibraries:$aboutlibraries_version"
// Tests // Tests
testImplementation 'junit:junit:4.13' testImplementation 'junit:junit:4.13'
testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.assertj:assertj-core:3.16.1'
testImplementation 'org.mockito:mockito-core:1.10.19' testImplementation 'org.mockito:mockito-core:1.10.19'
final robolectric_version = '3.1.4' final robolectric_version = '3.1.4'
@ -291,9 +290,8 @@ dependencies {
testImplementation "org.robolectric:shadows-multidex:$robolectric_version" testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
testImplementation "org.robolectric:shadows-play-services:$robolectric_version" testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$BuildPluginsVersion.KOTLIN"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$BuildPluginsVersion.KOTLIN"
final coroutines_version = '1.3.8' final coroutines_version = '1.3.8'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
@ -359,12 +357,11 @@ dependencies {
} }
buildscript { buildscript {
ext.kotlin_version = '1.3.72'
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$BuildPluginsVersion.KOTLIN"
} }
} }

4
build.gradle.kts
View File

@ -2,7 +2,7 @@ plugins {
id("com.android.application") version BuildPluginsVersion.AGP apply false id("com.android.application") version BuildPluginsVersion.AGP apply false
id("com.android.library") version BuildPluginsVersion.AGP apply false id("com.android.library") version BuildPluginsVersion.AGP apply false
kotlin("android") version BuildPluginsVersion.KOTLIN apply false kotlin("android") version BuildPluginsVersion.KOTLIN apply false
id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT_PLUGIN
id("com.github.ben-manes.versions") version BuildPluginsVersion.VERSIONS_PLUGIN id("com.github.ben-manes.versions") version BuildPluginsVersion.VERSIONS_PLUGIN
} }
@ -42,7 +42,7 @@ buildscript {
classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0")
classpath("com.github.zellius:android-shortcut-gradle-plugin:0.1.2") classpath("com.github.zellius:android-shortcut-gradle-plugin:0.1.2")
classpath("com.google.gms:google-services:4.3.3") classpath("com.google.gms:google-services:4.3.3")
classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.2.0") classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.3.0")
// Realm (EH) // Realm (EH)
classpath("io.realm:realm-gradle-plugin:7.0.1") classpath("io.realm:realm-gradle-plugin:7.0.1")

4
buildSrc/src/main/kotlin/Dependencies.kt
View File

@ -1,10 +1,10 @@
object Versions { object Versions {
const val KTLINT = "0.36.0" const val KTLINT = "0.37.2"
} }
object BuildPluginsVersion { object BuildPluginsVersion {
const val AGP = "4.0.1" const val AGP = "4.0.1"
const val KOTLIN = "1.3.72" const val KOTLIN = "1.3.72"
const val KTLINT = "9.2.1" const val KTLINT_PLUGIN = "9.3.0"
const val VERSIONS_PLUGIN = "0.28.0" const val VERSIONS_PLUGIN = "0.28.0"
} }