From ff82e54f36bb13147b06419b39ac1ecab4f959d2 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Fri, 30 Aug 2024 17:46:04 +0200 Subject: [PATCH 1/2] Update dependencies and increment release number --- app/build.gradle | 24 ++++++++++++------------ build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4e0097c8..896c2410 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ android { defaultConfig { minSdkVersion 23 targetSdkVersion 34 - versionCode 35 + versionCode 36 versionName "1.0.beta" + versionCode //TODO add resConfigs("en", "fr", "ja",...) ? @@ -232,17 +232,17 @@ dependencies { implementation 'com.google.android.material:material:1.12.0' //Dagger (dependency injection) - implementation 'com.google.dagger:dagger:2.51.1' - ksp 'com.google.dagger:dagger-compiler:2.51.1' + implementation 'com.google.dagger:dagger:2.52' + ksp 'com.google.dagger:dagger-compiler:2.52' - implementation('com.google.dagger:hilt-android:2.51') - ksp 'com.google.dagger:hilt-compiler:2.51' + implementation('com.google.dagger:hilt-android:2.52') + ksp 'com.google.dagger:hilt-compiler:2.52' implementation 'com.squareup.okhttp3:okhttp:4.12.0' - implementation 'com.squareup.retrofit2:retrofit:2.10.0' - implementation 'com.squareup.retrofit2:converter-gson:2.10.0' - implementation 'com.squareup.retrofit2:adapter-rxjava3:2.10.0' - implementation 'io.reactivex.rxjava3:rxjava:3.1.8' + implementation 'com.squareup.retrofit2:retrofit:2.11.0' + implementation 'com.squareup.retrofit2:converter-gson:2.11.0' + implementation 'com.squareup.retrofit2:adapter-rxjava3:2.11.0' + implementation 'io.reactivex.rxjava3:rxjava:3.1.9' implementation 'io.reactivex.rxjava3:rxandroid:3.0.2' implementation 'com.github.connyduck:sparkbutton:4.1.0' @@ -284,17 +284,17 @@ dependencies { androidTestUtil 'com.linkedin.testbutler:test-butler-app:2.2.1' androidTestImplementation 'androidx.work:work-testing:2.9.1' - testImplementation 'com.github.tomakehurst:wiremock-jre8:2.34.0' + testImplementation 'org.wiremock:wiremock:3.9.1' testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" testImplementation 'junit:junit:4.13.2' testImplementation "androidx.room:room-testing:$room_version" androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0' - androidTestImplementation 'androidx.test:runner:1.6.1' + androidTestImplementation 'androidx.test:runner:1.6.2' androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test.ext:junit:1.2.1' - androidTestImplementation 'androidx.test:runner:1.6.1' + androidTestImplementation 'androidx.test:runner:1.6.2' androidTestImplementation 'androidx.test:rules:1.6.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1' diff --git a/build.gradle b/build.gradle index 4ee10a94..1b763506 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.9.20' + ext.kotlin_version = '2.0.20' repositories { google() mavenCentral() @@ -15,8 +15,8 @@ buildscript { } plugins { - id 'com.google.devtools.ksp' version '1.9.20-1.0.14' apply false - id("com.google.dagger.hilt.android") version "2.50" apply false + id 'com.google.devtools.ksp' version '2.0.20-1.0.24' apply false + id("com.google.dagger.hilt.android") version "2.52" apply false } allprojects { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 465544df..ffc4f5ba 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=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae +distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 1e4a7904f63fa1652af00b4918e30c28e0fbbaf0 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Fri, 30 Aug 2024 18:29:42 +0200 Subject: [PATCH 2/2] Update dependencies and solve lint issues --- .../org/pixeldroid/app/profile/EditProfileActivity.kt | 8 ++++---- app/src/main/res/layout/error_layout.xml | 2 +- pixel_common | 2 +- scrambler | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt b/app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt index e7113268..cd72dc89 100644 --- a/app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt @@ -42,14 +42,14 @@ class EditProfileActivity : BaseActivity() { setMessage(getString(R.string.profile_save_changes)) setNegativeButton(android.R.string.cancel) { _, _ -> } setPositiveButton(android.R.string.ok) { _, _ -> - this@addCallback.isEnabled = false - super.onBackPressedDispatcher.onBackPressed() + this@addCallback.remove() + onBackPressedDispatcher.onBackPressed() } }.show() } else { - this.isEnabled = false + this@addCallback.remove() if (model.submittedChanges) setResult(RESULT_OK) - super.onBackPressedDispatcher.onBackPressed() + onBackPressedDispatcher.onBackPressed() } } diff --git a/app/src/main/res/layout/error_layout.xml b/app/src/main/res/layout/error_layout.xml index 4d586d48..a411a28f 100644 --- a/app/src/main/res/layout/error_layout.xml +++ b/app/src/main/res/layout/error_layout.xml @@ -34,7 +34,7 @@ app:layout_constraintTop_toBottomOf="@+id/imageView4" />