Merge branch 'release36' into 'master'

Update dependencies and increment release number

See merge request pixeldroid/PixelDroid!602

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'

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()
             }
         }
 

app/src/main/res/layout/error_layout.xml

@@ -34,7 +34,7 @@
         app:layout_constraintTop_toBottomOf="@+id/imageView4" />
 
     <TextView
-        android:id="@id/error_text"
+        android:id="@+id/error_text2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/panda_pull_to_refresh_to_try_again"

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 {

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

pixel_common

@@ -1 +1 @@
-Subproject commit def947b5b1392b3282174bebd0217037f66d0362
+Subproject commit c03698e241de89725c5ded420da696f7961387d4

scrambler

@@ -1 +1 @@
-Subproject commit 23d4d94b45a848f0c64a042985eb03d0acc2f18b
+Subproject commit 1584ad2ac65e75a3fa53d71280d04d4ac015d39f