Update some dependencies
- Add dependency plugin - Update gradle wrapper version - Update build script to remove deprecations
This commit is contained in:
parent
05f72d2f77
commit
ca615d51aa
|
@ -10,6 +10,7 @@ plugins {
|
||||||
id("com.gladed.androidgitversion") version "0.4.14"
|
id("com.gladed.androidgitversion") version "0.4.14"
|
||||||
id("com.github.triplet.play") version "2.4.2"
|
id("com.github.triplet.play") version "2.4.2"
|
||||||
id("de.mobilej.unmock")
|
id("de.mobilej.unmock")
|
||||||
|
id("com.github.ben-manes.versions")
|
||||||
jacoco
|
jacoco
|
||||||
id("com.vanniktech.android.junit.jacoco")
|
id("com.vanniktech.android.junit.jacoco")
|
||||||
}
|
}
|
||||||
|
@ -48,21 +49,24 @@ android {
|
||||||
viewBinding = true
|
viewBinding = true
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
lint {
|
||||||
disable("MissingTranslation")
|
disable("MissingTranslation")
|
||||||
}
|
}
|
||||||
|
|
||||||
compileSdkVersion(30)
|
compileSdkVersion(30)
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "audio.funkwhale.ffa"
|
|
||||||
|
|
||||||
minSdkVersion(24)
|
applicationId = "audio.funkwhale.ffa"
|
||||||
targetSdkVersion(30)
|
|
||||||
|
|
||||||
versionCode = androidGitVersion.code()
|
versionCode = androidGitVersion.code()
|
||||||
versionName = androidGitVersion.name()
|
versionName = androidGitVersion.name()
|
||||||
|
|
||||||
|
minSdk = 24
|
||||||
|
targetSdk = 30
|
||||||
|
|
||||||
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
manifestPlaceholders["appAuthRedirectScheme"] = "urn"
|
manifestPlaceholders["appAuthRedirectScheme"] = "urn"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -154,7 +158,7 @@ dependencies {
|
||||||
|
|
||||||
implementation("androidx.appcompat:appcompat:1.3.1")
|
implementation("androidx.appcompat:appcompat:1.3.1")
|
||||||
implementation("androidx.core:core-ktx:1.6.0")
|
implementation("androidx.core:core-ktx:1.6.0")
|
||||||
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-alpha02")
|
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-alpha03")
|
||||||
implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
|
implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
|
||||||
implementation("androidx.preference:preference-ktx:1.1.1")
|
implementation("androidx.preference:preference-ktx:1.1.1")
|
||||||
implementation("androidx.recyclerview:recyclerview:1.2.1")
|
implementation("androidx.recyclerview:recyclerview:1.2.1")
|
||||||
|
@ -165,6 +169,7 @@ dependencies {
|
||||||
implementation("com.google.android.exoplayer:exoplayer-core:${Versions.exoPlayer}")
|
implementation("com.google.android.exoplayer:exoplayer-core:${Versions.exoPlayer}")
|
||||||
implementation("com.google.android.exoplayer:exoplayer-ui:${Versions.exoPlayer}")
|
implementation("com.google.android.exoplayer:exoplayer-ui:${Versions.exoPlayer}")
|
||||||
implementation("com.google.android.exoplayer:extension-mediasession:${Versions.exoPlayer}")
|
implementation("com.google.android.exoplayer:extension-mediasession:${Versions.exoPlayer}")
|
||||||
|
|
||||||
implementation("com.github.PaulWoitaschek.ExoPlayer-Extensions:extension-opus:${Versions.exoPlayerExtensions}") {
|
implementation("com.github.PaulWoitaschek.ExoPlayer-Extensions:extension-opus:${Versions.exoPlayerExtensions}") {
|
||||||
isTransitive = false
|
isTransitive = false
|
||||||
}
|
}
|
||||||
|
@ -181,11 +186,13 @@ dependencies {
|
||||||
implementation("com.squareup.picasso:picasso:2.71828")
|
implementation("com.squareup.picasso:picasso:2.71828")
|
||||||
implementation("jp.wasabeef:picasso-transformations:2.4.0")
|
implementation("jp.wasabeef:picasso-transformations:2.4.0")
|
||||||
implementation("net.openid:appauth:${Versions.openIdAppAuth}")
|
implementation("net.openid:appauth:${Versions.openIdAppAuth}")
|
||||||
|
|
||||||
testImplementation("junit:junit:4.13.2")
|
testImplementation("junit:junit:4.13.2")
|
||||||
testImplementation("io.mockk:mockk:1.12.0")
|
testImplementation("io.mockk:mockk:1.12.0")
|
||||||
androidTestImplementation("io.mockk:mockk-android:${Versions.mockk}")
|
|
||||||
testImplementation("androidx.test:core:1.4.0")
|
testImplementation("androidx.test:core:1.4.0")
|
||||||
testImplementation("io.strikt:strikt-core:${Versions.strikt}")
|
testImplementation("io.strikt:strikt-core:${Versions.strikt}")
|
||||||
|
|
||||||
|
androidTestImplementation("io.mockk:mockk-android:${Versions.mockk}")
|
||||||
}
|
}
|
||||||
|
|
||||||
project.afterEvaluate {
|
project.afterEvaluate {
|
||||||
|
|
|
@ -4,6 +4,7 @@ buildscript {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
jcenter()
|
jcenter()
|
||||||
|
gradlePluginPortal()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
@ -11,6 +12,7 @@ buildscript {
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
|
||||||
classpath("com.github.bjoernq:unmockplugin:${Versions.unmock}")
|
classpath("com.github.bjoernq:unmockplugin:${Versions.unmock}")
|
||||||
classpath("com.vanniktech:gradle-android-junit-jacoco-plugin:${Versions.gradleAndroidJUnitJacocoPlugin}")
|
classpath("com.vanniktech:gradle-android-junit-jacoco-plugin:${Versions.gradleAndroidJUnitJacocoPlugin}")
|
||||||
|
classpath("com.github.ben-manes:gradle-versions-plugin:${Versions.gradleDependencyPlugin}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ object Versions {
|
||||||
const val unmock = "0.7.8"
|
const val unmock = "0.7.8"
|
||||||
const val androidGradlePlugin = "7.0.0"
|
const val androidGradlePlugin = "7.0.0"
|
||||||
const val gradleAndroidJUnitJacocoPlugin = "0.16.0"
|
const val gradleAndroidJUnitJacocoPlugin = "0.16.0"
|
||||||
|
const val gradleDependencyPlugin = "0.38.0"
|
||||||
|
|
||||||
const val exoPlayer = "2.11.8"
|
const val exoPlayer = "2.11.8"
|
||||||
const val exoPlayerExtensions = "2.11.4"
|
const val exoPlayerExtensions = "2.11.4"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
Loading…
Reference in New Issue