diff --git a/MIGRATION.md b/MIGRATION.md
index 26bc5389..3db54f3d 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -1,5 +1,10 @@
 ### Upgrade Notes
 
+#### Version 0.39.0
+
+- **Note**: The `highlights` library in v1.1.0 seems to be compiled with Java 21
+- **Note**: Some dependencies start to require minSDK: 23 (compared to the minSDK of 21 from before)
+
 #### Version 0.38.0
 
 - **Breaking Change**: Removes prior deprecated APIs and functionality (`PlaceholderConfig.animate`)
diff --git a/build.gradle.kts b/build.gradle.kts
index 8c718b45..235da6ce 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
     alias(baseLibs.plugins.mavenPublish) apply false
     alias(baseLibs.plugins.binaryCompatiblityValidator) apply false
     alias(baseLibs.plugins.versionCatalogUpdate) apply false
-    alias(baseLibs.plugins.compatPatrouille) apply false
+    alias(baseLibs.plugins.tapmoc) apply false
 }
 
 allprojects {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 71a7c573..28945a41 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-androidx-activityCompose = "1.10.1"
+androidx-activityCompose = "1.12.2"
 coil = "3.3.0"
 coil2 = "2.7.0"
 markdown = "0.7.3"
-ktor = "3.2.3"
-highlights = "1.0.0"
+ktor = "3.3.3"
+highlights = "1.1.0"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
diff --git a/sample/android/gradle.properties b/sample/android/gradle.properties
index c328bd32..2fbeaa7d 100644
--- a/sample/android/gradle.properties
+++ b/sample/android/gradle.properties
@@ -1 +1,2 @@
-com.mikepenz.binary-compatibility-validator.enabled=false
\ No newline at end of file
+com.mikepenz.binary-compatibility-validator.enabled=false
+com.mikepenz.android.minSdk=23
\ No newline at end of file
diff --git a/sample/desktop/build.gradle.kts b/sample/desktop/build.gradle.kts
index eafafeaa..ac416fe1 100644
--- a/sample/desktop/build.gradle.kts
+++ b/sample/desktop/build.gradle.kts
@@ -36,9 +36,6 @@ compose.resources {
 }
 
 aboutLibraries {
-    android {
-        registerAndroidTasks = false
-    }
     export {
         exportVariant = "jvmMain"
         outputPath = file("src/commonMain/composeResources/files/aboutlibraries.json")
diff --git a/sample/desktop/gradle.properties b/sample/desktop/gradle.properties
index 92fa47a0..4ddebddc 100644
--- a/sample/desktop/gradle.properties
+++ b/sample/desktop/gradle.properties
@@ -1,2 +1,3 @@
 com.mikepenz.binary-compatibility-validator.enabled=false
 com.mikepenz.hotreload.enabled=true
+com.mikepenz.java.version=21
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index aa91c0da..0def08ea 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,7 +28,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("baseLibs") {
-            from("com.mikepenz:version-catalog:0.9.0")
+            from("com.mikepenz:version-catalog:0.10.1")
         }
     }
 }