From 85229301fd2da31dc8011d1479f4b4609a199add Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 7 Aug 2021 12:55:39 +0900 Subject: [PATCH] update libraries and other tools --- app/build.gradle | 28 ++++++++++++------------ build.gradle | 4 ++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 89a9763e..7acf8496 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,25 +52,25 @@ android { compileOptions { coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } } dependencies { - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' implementation 'com.github.jellyfin.jellyfin-apiclient-java:android:0.7.3' implementation 'com.github.woltapp:blurhash:f41a23cc50' implementation 'com.google.android.exoplayer:exoplayer:2.12.2' - implementation 'com.google.android.material:material:1.4.0-rc01' + implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.core:core-ktx:1.5.0' - implementation 'androidx.media:media:1.3.1' - implementation 'androidx.fragment:fragment-ktx:1.3.5' + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.media:media:1.4.1' + implementation 'androidx.fragment:fragment-ktx:1.3.6' implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' @@ -78,7 +78,7 @@ dependencies { implementation 'androidx.annotation:annotation:1.2.0' implementation 'androidx.percentlayout:percentlayout:1.0.0' implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod' implementation 'com.github.kabouzeid:SeekArc:1.2-kmod' @@ -104,8 +104,8 @@ dependencies { annotationProcessor 'androidx.room:room-compiler:2.3.0' implementation 'androidx.room:room-runtime:2.3.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' - implementation 'com.github.bumptech.glide:annotations:4.11.0' - implementation 'com.github.bumptech.glide:glide:4.11.0' - implementation 'com.github.bumptech.glide:okhttp3-integration:4.11.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' + implementation 'com.github.bumptech.glide:annotations:4.12.0' + implementation 'com.github.bumptech.glide:glide:4.12.0' + implementation 'com.github.bumptech.glide:okhttp3-integration:4.12.0' } diff --git a/build.gradle b/build.gradle index 53be5646..d2ba2f45 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20' } } diff --git a/gradle.properties b/gradle.properties index e5f12a37..030d17db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx2048M org.gradle.daemon=true org.gradle.parallel=true android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a848a52f..3fd6a25c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip diff --git a/settings.gradle b/settings.gradle index 0008bb76..f7c04dc6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,4 +9,4 @@ if (new File(apiClientLocation).exists() && enableDependencySubstitution) { substitute module('com.github.jellyfin.jellyfin-apiclient-java:android') with project(':android') } } -} \ No newline at end of file +}