diff --git a/.gitignore b/.gitignore
index e09c9c1..2da6d57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 *.iws
 
 .gradle/
+.kotlin/
 build/
 !gradle/wrapper/gradle-wrapper.jar
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 090c98e..c152c20 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -19,8 +20,8 @@ allprojects {
 
 subprojects {
     tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f1b4af6..7819b12 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,26 +1,25 @@
 [versions]
-kotlin = "1.9.0"
-androidGradlePlugin = "8.5.1"
+kotlin = "2.2.20"
+androidGradlePlugin = "8.13.0"
 
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.28.0" }
+maven-publish = { id = "com.vanniktech.maven.publish", version = "0.34.0" }
 
 [libraries]
-# Library Dependencies
-androidx-core = { group = "androidx.core", name = "core", version = "1.13.1" }
-androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.2" }
+androidx-core = { group = "androidx.core", name = "core", version = "1.17.0" }
+androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.4.0" }
 androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version = "1.1.0" }
 
 # Test Dependencies
 junit = { group = "junit", name = "junit", version = "4.13.2" }
-androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version = "1.2.1" }
-androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version = "3.6.1" }
+androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version = "1.3.0" }
+androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version = "3.7.0" }
 
 # Sample Dependencies
-android-material = { group = "com.google.android.material", name = "material", version = "1.12.0" }
-androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
-androidx-activity = { group = "androidx.activity", name = "activity", version = "1.9.0" }
-androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" }
+android-material = { group = "com.google.android.material", name = "material", version = "1.13.0" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.1" }
+androidx-activity = { group = "androidx.activity", name = "activity", version = "1.11.0" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.2.1" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e8425c..f49cfd2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jul 21 14:18:49 KST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 32d4228..93c5c76 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace = "${project.group}.sample"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "${project.group}.sample"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "${project.version}"
     }
diff --git a/simplecarousel-pager/build.gradle.kts b/simplecarousel-pager/build.gradle.kts
index b3292f2..f2025a3 100644
--- a/simplecarousel-pager/build.gradle.kts
+++ b/simplecarousel-pager/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.vanniktech.maven.publish.SonatypeHost
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -8,12 +6,10 @@ plugins {
 
 android {
     namespace = "${project.group}.pager"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -35,7 +31,7 @@ dependencies {
 }
 
 mavenPublishing {
-    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+    publishToMavenCentral()
     signAllPublications()
     coordinates("${project.group}", "simplecarousel-pager", "${project.version}")
 
diff --git a/simplecarousel-pager/src/main/java/com/cheonjaeung/simplecarousel/android/pager/CarouselFragmentStateAdapter.kt b/simplecarousel-pager/src/main/java/com/cheonjaeung/simplecarousel/android/pager/CarouselFragmentStateAdapter.kt
index 459ca3a..d70804f 100644
--- a/simplecarousel-pager/src/main/java/com/cheonjaeung/simplecarousel/android/pager/CarouselFragmentStateAdapter.kt
+++ b/simplecarousel-pager/src/main/java/com/cheonjaeung/simplecarousel/android/pager/CarouselFragmentStateAdapter.kt
@@ -97,7 +97,7 @@ abstract class CarouselFragmentStateAdapter : RecyclerView.Adapter<FragmentViewH
     }
 
     override fun restoreState(savedState: Parcelable) {
-        if (savedStates.isEmpty || fragments.isEmpty) {
+        if (savedStates.isEmpty() || fragments.isEmpty()) {
             throw IllegalStateException("The adapter is not fresh while restoring state")
         }
 
@@ -113,8 +113,10 @@ abstract class CarouselFragmentStateAdapter : RecyclerView.Adapter<FragmentViewH
             if (isValidKey(key, KEY_PREFIX_FRAGMENT)) {
                 val itemId = parseIdFromKey(key, KEY_PREFIX_FRAGMENT)
                 val fragment = fragmentManager.getFragment(savedState, key)
-                fragments.put(itemId, fragment)
-                continue
+                if (fragment != null) {
+                    fragments.put(itemId, fragment)
+                    continue
+                }
             }
 
             if (isValidKey(key, KEY_PREFIX_STATE)) {
@@ -124,16 +126,18 @@ abstract class CarouselFragmentStateAdapter : RecyclerView.Adapter<FragmentViewH
                 } else {
                     savedState.getParcelable(key)
                 }
-                if (containsItem(itemId)) {
-                    savedStates.put(itemId, state)
+                if (state != null) {
+                    if (containsItem(itemId)) {
+                        savedStates.put(itemId, state)
+                    }
+                    continue
                 }
-                continue
             }
 
             throw IllegalArgumentException("Unexpected key found while restoring state: $key")
         }
 
-        if (!fragments.isEmpty) {
+        if (!fragments.isEmpty()) {
             isInGracePeriod = true
             hasStaleFragments = true
             gcFragments()
@@ -428,7 +432,9 @@ abstract class CarouselFragmentStateAdapter : RecyclerView.Adapter<FragmentViewH
             val listeners = fragmentEventDispatcher.dispatchPreSavedInstanceState(fragment)
             val savedState = fragmentManager.saveFragmentInstanceState(fragment)
             fragmentEventDispatcher.dispatchPostEvents(listeners)
-            savedStates.put(targetId, savedState)
+            if (savedState != null) {
+                savedStates.put(targetId, savedState)
+            }
         }
 
         val listeners = fragmentEventDispatcher.dispatchPreRemove(fragment)
@@ -565,7 +571,7 @@ abstract class CarouselFragmentStateAdapter : RecyclerView.Adapter<FragmentViewH
                 return
             }
 
-            if (fragments.isEmpty || itemCount == 0) {
+            if (fragments.isEmpty() || itemCount == 0) {
                 return
             }
 
diff --git a/simplecarousel/build.gradle.kts b/simplecarousel/build.gradle.kts
index eb9069f..1e3718b 100644
--- a/simplecarousel/build.gradle.kts
+++ b/simplecarousel/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.vanniktech.maven.publish.SonatypeHost
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -8,11 +6,10 @@ plugins {
 
 android {
     namespace = "${project.group}"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
     }
 
     compileOptions {
@@ -31,7 +28,7 @@ dependencies {
 }
 
 mavenPublishing {
-    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+    publishToMavenCentral()
     signAllPublications()
     coordinates("${project.group}", "simplecarousel", "${project.version}")