Android Studio 4.2 support.

This commit is contained in:
casey langen 2021-05-11 12:57:50 -07:00
parent ec842cfcb0
commit 70a35adf39
5 changed files with 18 additions and 22 deletions

View File

@ -1,7 +1,7 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
}
@ -48,14 +48,14 @@ android {
}
repositories {
flatDir { dirs '../../3rdparty/bin/android/aar/' }
maven { url "https://jitpack.io" }
maven { url 'https://maven.google.com' }
google()
mavenCentral()
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation files('../../3rdparty/bin/android/aar/android-taskrunner-0.5.aar')
implementation files('../../3rdparty/bin/android/aar/exoplayer-extension-flac-release-v2.aar')
implementation files('../../3rdparty/bin/android/aar/videocache-2.8.0-clangen-5.aar')
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
exclude group: 'com.android.support', module: 'support-annotations'
@ -65,21 +65,17 @@ dependencies {
implementation 'com.google.firebase:firebase-core:18.0.3'
implementation 'com.google.firebase:firebase-crashlytics:17.4.1'
implementation(name:'android-taskrunner-0.5', ext:'aar')
implementation(name:'exoplayer-extension-flac-release-v2', ext:'aar')
implementation(name:'videocache-2.8.0-clangen-5', ext:'aar')
implementation 'org.slf4j:slf4j-android:1.7.21'
implementation "androidx.room:room-runtime:2.2.6"
kapt "androidx.room:room-compiler:2.2.6"
implementation "androidx.room:room-runtime:2.3.0"
kapt "androidx.room:room-compiler:2.3.0"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation "androidx.lifecycle:lifecycle-common-java8:2.3.1"
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
implementation 'com.google.dagger:dagger:2.27'
implementation 'com.google.dagger:dagger:2.28.3'
kapt 'com.google.dagger:dagger-compiler:2.27'
implementation 'com.neovisionaries:nv-websocket-client:1.31'
@ -97,8 +93,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.2.0'
implementation 'com.google.android.material:material:1.4.0-alpha02'
implementation 'androidx.media:media:1.3.0'
implementation 'com.google.android.material:material:1.4.0-beta01'
implementation 'androidx.media:media:1.3.1'
testImplementation 'junit:junit:4.12'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

View File

@ -50,10 +50,10 @@ class DiagnosticsActivity: BaseActivity() {
Duration.formatWithHours(SystemService.wakeLockTime))
wakeAcquired.text = getString(
R.string.diagnostics_wakelock_acquired,
SystemService.isWakeLockActive.toString().toLowerCase())
SystemService.isWakeLockActive.toString().lowercase())
serviceState.text = getString(
R.string.diagnostics_system_service,
SystemService.state.toString().toLowerCase())
SystemService.state.toString().lowercase())
}
private val refreshRunnable = object: Runnable {

View File

@ -456,7 +456,7 @@ fun createHttpClient(context: Context): OkHttpClient {
fun InputStream.toFile(path: String, progress: ((Long) -> Unit)? = null): Boolean {
try {
File(path).parentFile.mkdirs()
File(path).parentFile?.mkdirs()
File(path).delete()
FileOutputStream(path, false).use { out ->
val reader = BufferedInputStream(this)

View File

@ -1,13 +1,13 @@
buildscript {
ext.kotlin_version = '1.4.10'
ext.kotlin_version = '1.5.0'
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:4.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
@ -17,7 +17,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip