diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 01cb94d..0215771 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="corretto-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/build.gradle b/build.gradle
index 27843d2..4f7416d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.13.0'
 
         // Required plugins added to classpath to facilitate pushing to maven
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9cb2b8..b93eb0a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 04 11:57:33 CET 2023
+#Tue Sep 30 18:40:20 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lintchecks/build.gradle b/lintchecks/build.gradle
index 43a6afc..fd9f339 100644
--- a/lintchecks/build.gradle
+++ b/lintchecks/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'com.android.lint'
 
 dependencies {
     // If the Gradle plugin version is X.Y.Z, then the Lint library version is X+23.Y.Z
-    compileOnly 'com.android.tools.lint:lint-api:31.9.1'
-    compileOnly 'com.android.tools.lint:lint-checks:31.9.1'
+    compileOnly 'com.android.tools.lint:lint-api:31.13.0'
+    compileOnly 'com.android.tools.lint:lint-checks:31.13.0'
 }
 
 jar {
diff --git a/simpledialogfragments/build.gradle b/simpledialogfragments/build.gradle
index 779d3fb..ef0f70a 100644
--- a/simpledialogfragments/build.gradle
+++ b/simpledialogfragments/build.gradle
@@ -3,9 +3,9 @@ apply plugin: 'com.android.library'
 android {
     namespace 'eltos.simpledialogfragment'
 
-    compileSdk 34
 
     defaultConfig {
+        compileSdkVersion 36
         minSdkVersion 21
         targetSdkVersion 34
     }
@@ -34,8 +34,8 @@ dependencies {
     lintPublish project(':lintchecks')
 
     testImplementation  'junit:junit:4.13.2'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'com.google.android.material:material:1.13.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'com.alimuzaffar.lib:pinentryedittext:2.0.6'
 }
diff --git a/simpledialogfragments/src/main/java/eltos/simpledialogfragment/SimpleProgressDialog.java b/simpledialogfragments/src/main/java/eltos/simpledialogfragment/SimpleProgressDialog.java
index 9ef5ad3..ef88bc4 100644
--- a/simpledialogfragments/src/main/java/eltos/simpledialogfragment/SimpleProgressDialog.java
+++ b/simpledialogfragments/src/main/java/eltos/simpledialogfragment/SimpleProgressDialog.java
@@ -16,6 +16,7 @@
 
 package eltos.simpledialogfragment;
 
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -282,13 +283,21 @@ public void updateFinished(){
             setPositiveButtonEnabled(true);
             setNeutralButtonEnabled(false);
             if (getArgs().getBoolean(AUTO_DISMISS)){
-                dismiss();
+                dismissAllowingStateLoss(); // ok to fail if stopped, will dismiss in onResume
                 callResultListener(COMPLETED, new Bundle());
             }
         }
     }
 
-
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getArgs().getBoolean(AUTO_DISMISS)) {
+            if (mTask != null && mTask.getStatus() == AsyncTask.Status.FINISHED) {
+                dismiss();
+            }
+        }
+    }
 
     /**
      * Set or update the progress text at the start of the progress bar /
diff --git a/testApp/build.gradle b/testApp/build.gradle
index 4b77b9b..6c2997d 100644
--- a/testApp/build.gradle
+++ b/testApp/build.gradle
@@ -6,10 +6,10 @@ plugins {
 android {
     namespace 'eltos.simpledialogfragments'
 
-    compileSdk 34
 
     defaultConfig {
         applicationId 'eltos.simpledialogfragments.test'
+        compileSdkVersion 36
         minSdkVersion 21
         targetSdkVersion 34
         versionCode rootProject.ext['VERSION_NR']
@@ -30,10 +30,10 @@ repositories {
 
 dependencies {
     testImplementation  'junit:junit:4.13.2'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'com.google.android.material:material:1.13.0'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
-    implementation 'com.google.zxing:core:3.5.2'
+    implementation 'com.google.zxing:core:3.5.3'
 
     // sonatype maven
     //implementation 'io.github.eltos:simpledialogfragments:3.5.1'