diff --git a/demo/build.gradle b/demo/build.gradle
index dbe505e..ad0d29b 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -23,12 +23,12 @@ dependencies {
 
 android {
   namespace 'com.devbrackets.android.datastoredemo'
-  compileSdk = 36
+  compileSdk = 37
 
   defaultConfig {
     applicationId "com.devbrackets.android.datastoredemo"
     minSdkVersion 23
-    targetSdkVersion 36
+    targetSdkVersion 37
     versionCode 1
     versionName "1.0.0"
   }
diff --git a/gradle.properties b/gradle.properties
index c737975..fa9c9a8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,15 @@
+android.builtInKotlin=false
+android.defaults.buildfeatures.resvalues=true
+android.dependency.useConstraints=true
+android.enableAppCompileTimeRClass=false
 android.enableJetifier=true
+android.newDsl=false
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
+android.r8.optimizedResourceShrinking=false
+android.r8.strictFullModeForKeepRules=false
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.uniquePackageNames=false
 android.useAndroidX=true
+android.usesSdkInManifest.disallowed=false
 org.gradle.jvmargs=-Xms512m
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 85c559f..3a335b7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-activityCompose = "1.10.1"
-androidGradlePlugin = "8.12.0"
+activityCompose = "1.13.0"
+androidGradlePlugin = "9.2.1"
 appcompat = "1.7.1"
-coreKtx = "1.17.0"
-datastorePreferences = "1.1.7"
+coreKtx = "1.18.0"
+datastorePreferences = "1.2.1"
 junit = "4.13.2"
-kotlin = "2.2.10"
-navigationCompose = "2.9.3"
+kotlin = "2.3.21"
+navigationCompose = "2.9.8"
 nexusPublish = "2.0.0"
-robolectric = "4.15.1"
-composeUi = "1.9.0"
+robolectric = "4.16.1"
+composeUi = "1.11.2"
 
 [libraries]
 activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
@@ -20,7 +20,7 @@ datastore-preferences = { module = "androidx.datastore:datastore-preferences", v
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
-material = { module = "androidx.compose.material:material", version = "1.9.0" }
+material = { module = "androidx.compose.material:material", version = "1.11.2" }
 material-icons-core = { module = "androidx.compose.material:material-icons-core", version = "1.7.8" }
 navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c6f0030..5b59ea8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library/build.gradle b/library/build.gradle
index ac9c141..5b9dd85 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -18,13 +18,12 @@ dependencies {
 }
 
 android {
-  compileSdk = 36
+  compileSdk = 37
 
   namespace 'com.devbrackets.android.datastore'
 
   defaultConfig {
     minSdkVersion 23
-    targetSdkVersion 36
   }
 
   sourceSets {
@@ -49,9 +48,11 @@ android {
     unitTests {
       includeAndroidResources = true
     }
+    targetSdk 37
   }
 
   lint {
     abortOnError false
+    targetSdk 37
   }
 }
diff --git a/library/src/main/kotlin/com/devbrackets/android/datastore/converter/ValueConverterExt.kt b/library/src/main/kotlin/com/devbrackets/android/datastore/converter/ValueConverterExt.kt
index c6adc8c..72ad96c 100644
--- a/library/src/main/kotlin/com/devbrackets/android/datastore/converter/ValueConverterExt.kt
+++ b/library/src/main/kotlin/com/devbrackets/android/datastore/converter/ValueConverterExt.kt
@@ -13,7 +13,7 @@ import com.devbrackets.android.datastore.converter.core.NonNullValueConverter
  * val chainedConverter = EncryptedValueConverter().then(Base64ValueConverter())
  * ```
  *
- * This method is short-hand for the [ChainedValueConverter].
+ * This method is shorthand for the [ChainedValueConverter].
  *
  * @param nextConverter The [ValueConverter] that should be called after the target [ValueConverter]
  */
@@ -25,7 +25,7 @@ fun <ORIGINAL, INTERMEDIATE, CONVERTED> ValueConverter<ORIGINAL, INTERMEDIATE>.t
 
 /**
  * Converts the source [ValueConverter] to a [ValueConverter] with non-nullable types.
- * This method is short-hand for the [NonNullValueConverter].
+ * This method is shorthand for the [NonNullValueConverter].
  *
  * @param errorHandler The [NonNullValueConverter.ErrorHandler] to use for unexpected `null` values
  */