From c40c6f70dcc7ea5168ed21322131f0acd950d695 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Wed, 13 Dec 2023 11:11:35 +0100 Subject: [PATCH] Update dependencies --- app/build.gradle | 59 +++++++++--------------- build.gradle | 9 ++-- gradle/wrapper/gradle-wrapper.properties | 4 +- 3 files changed, 29 insertions(+), 43 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7813b01e..a242fa2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,38 +1,28 @@ import com.android.build.api.dsl.ManagedVirtualDevice -plugins { - id "com.mikepenz.aboutlibraries.plugin" version "10.5.2" -} - apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'com.mikepenz.aboutlibraries.plugin' -apply plugin: 'kotlin-kapt' apply plugin: 'jacoco' apply plugin: "kotlin-parcelize" - - - -// Force latest version of Jacoco, initially done to resolve https://github.com/jacoco/jacoco/issues/1155 -jacoco.toolVersion = "0.8.7" - +apply plugin: 'com.google.devtools.ksp' android { namespace 'org.pixeldroid.app' compileSdk 34 - compileOptions { + + compileOptions { coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 } androidResources { generateLocaleConfig true } + kotlin { + jvmToolchain(17) + } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"] } defaultConfig { @@ -117,11 +107,9 @@ android { } buildFeatures { viewBinding true - dataBinding = true buildConfig = true } - apply plugin: 'kotlin-kapt' lint { //We can't expect translators to always keep up immediately: // don't fail if a a string is untranslated @@ -135,7 +123,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' /** * AndroidX dependencies: @@ -145,13 +133,13 @@ dependencies { implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.navigation:navigation-fragment-ktx:2.7.4' - implementation 'androidx.navigation:navigation-ui-ktx:2.7.4' - implementation "androidx.browser:browser:1.6.0" + implementation 'androidx.navigation:navigation-fragment-ktx:2.7.5' + implementation 'androidx.navigation:navigation-ui-ktx:2.7.5' + implementation "androidx.browser:browser:1.7.0" implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" - implementation 'androidx.navigation:navigation-fragment-ktx:2.7.4' - implementation 'androidx.navigation:navigation-ui-ktx:2.7.4' + implementation 'androidx.navigation:navigation-fragment-ktx:2.7.5' + implementation 'androidx.navigation:navigation-ui-ktx:2.7.5' implementation 'androidx.paging:paging-runtime-ktx:3.2.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2' @@ -160,9 +148,9 @@ dependencies { implementation "androidx.lifecycle:lifecycle-common-java8:2.6.2" implementation "androidx.annotation:annotation:1.7.0" implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation "androidx.activity:activity-ktx:1.8.0" - implementation 'androidx.fragment:fragment-ktx:1.6.1' - implementation 'androidx.work:work-runtime-ktx:2.8.1' + implementation "androidx.activity:activity-ktx:1.8.1" + implementation 'androidx.fragment:fragment-ktx:1.6.2' + implementation 'androidx.work:work-runtime-ktx:2.9.0' implementation 'androidx.media2:media2-widget:1.2.1' implementation 'androidx.media2:media2-player:1.2.1' @@ -177,9 +165,9 @@ dependencies { // CameraX View class implementation "androidx.camera:camera-view:$cameraX_version" - def room_version = "2.6.0" + def room_version = "2.6.1" implementation "androidx.room:room-runtime:$room_version" - kapt "androidx.room:room-compiler:$room_version" + ksp "androidx.room:room-compiler:$room_version" implementation "androidx.room:room-ktx:$room_version" implementation "androidx.room:room-paging:$room_version" @@ -193,11 +181,8 @@ dependencies { implementation 'com.google.android.material:material:1.10.0' //Dagger (dependency injection) - implementation 'com.google.dagger:dagger-android:2.45' - implementation 'com.google.dagger:dagger-android-support:2.44' - // if you use the support libraries - kapt 'com.google.dagger:dagger-android-processor:2.44' - kapt 'com.google.dagger:dagger-compiler:2.47' + implementation 'com.google.dagger:dagger:2.48' + ksp 'com.google.dagger:dagger-compiler:2.48' implementation 'com.squareup.okhttp3:okhttp:4.11.0' implementation 'com.squareup.retrofit2:retrofit:2.9.0' @@ -223,7 +208,7 @@ dependencies { } implementation 'com.github.bumptech.glide:annotations:4.14.2' annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2' - kapt 'com.github.bumptech.glide:compiler:4.14.2' + ksp 'com.github.bumptech.glide:ksp:4.14.2' implementation 'androidx.legacy:legacy-support-v4:1.0.0' @@ -244,8 +229,6 @@ dependencies { implementation 'me.relex:circleindicator:2.1.6' - implementation 'com.mikepenz:aboutlibraries-core:10.6.0' - /** * Not in release, so not mentioned in licenses list */ @@ -256,7 +239,7 @@ dependencies { androidTestImplementation 'com.linkedin.testbutler:test-butler-library:2.2.1' androidTestUtil 'com.linkedin.testbutler:test-butler-app:2.2.1' - androidTestImplementation 'androidx.work:work-testing:2.8.1' + androidTestImplementation 'androidx.work:work-testing:2.9.0' testImplementation 'com.github.tomakehurst:wiremock-jre8:2.34.0' testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" testImplementation 'junit:junit:4.13.2' diff --git a/build.gradle b/build.gradle index c6424795..7eba61e2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { - ext.kotlin_version = '1.7.20' + ext.kotlin_version = '1.9.20' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -15,6 +14,10 @@ buildscript { } } +plugins { + id 'com.google.devtools.ksp' version '1.9.20-1.0.14' apply false +} + allprojects { repositories { google() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 570637ad..8daa1609 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ #Fri Oct 14 13:37:44 GMT 2022 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists