diff --git a/Beepy/build.gradle.kts b/Beepy/build.gradle.kts
index 8460e150..81315a26 100644
--- a/Beepy/build.gradle.kts
+++ b/Beepy/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "com.example.beepy"
-    compileSdk = 33
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.example.beepy"
         minSdk = 28
-        targetSdk = 33
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/ai-assistant/build.gradle.kts b/ai-assistant/build.gradle.kts
index b376da7c..4b6b5c73 100644
--- a/ai-assistant/build.gradle.kts
+++ b/ai-assistant/build.gradle.kts
@@ -10,12 +10,12 @@ pluginBuilder {
 
 android {
     namespace = "com.itsaky.androidide.plugins.aiassistant"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.itsaky.androidide.plugins.aiassistant"
         minSdk = 33
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/ai-assistant/gradle/wrapper/gradle-wrapper.properties b/ai-assistant/gradle/wrapper/gradle-wrapper.properties
index 692c2dc2..7c504ab6 100644
--- a/ai-assistant/gradle/wrapper/gradle-wrapper.properties
+++ b/ai-assistant/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ai-assistant/settings.gradle.kts b/ai-assistant/settings.gradle.kts
index de2975f0..a529bf5f 100644
--- a/ai-assistant/settings.gradle.kts
+++ b/ai-assistant/settings.gradle.kts
@@ -18,7 +18,7 @@ buildscript {
     dependencies {
         classpath(files("../libs/plugin-api.jar"))
         classpath(files("../libs/gradle-plugin.jar"))
-        classpath("com.android.tools.build:gradle:8.13.2")
+        classpath("com.android.tools.build:gradle:8.11.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
     }
 }
diff --git a/ai-core/build.gradle.kts b/ai-core/build.gradle.kts
index ff3a4772..663594a2 100644
--- a/ai-core/build.gradle.kts
+++ b/ai-core/build.gradle.kts
@@ -10,12 +10,12 @@ pluginBuilder {
 
 android {
     namespace = "com.itsaky.androidide.plugins.aicore"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.itsaky.androidide.plugins.aicore"
         minSdk = 33
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/ai-core/gradle/wrapper/gradle-wrapper.properties b/ai-core/gradle/wrapper/gradle-wrapper.properties
index 692c2dc2..7c504ab6 100644
--- a/ai-core/gradle/wrapper/gradle-wrapper.properties
+++ b/ai-core/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/ai-core/settings.gradle.kts b/ai-core/settings.gradle.kts
index 814b83f3..e6de23ea 100644
--- a/ai-core/settings.gradle.kts
+++ b/ai-core/settings.gradle.kts
@@ -18,7 +18,7 @@ buildscript {
     dependencies {
         classpath(files("../libs/plugin-api.jar"))
         classpath(files("../libs/gradle-plugin.jar"))
-        classpath("com.android.tools.build:gradle:8.13.2")
+        classpath("com.android.tools.build:gradle:8.11.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
     }
 }
diff --git a/ai-literacy-course/build.gradle.kts b/ai-literacy-course/build.gradle.kts
index 78a2fa9c..06342e17 100644
--- a/ai-literacy-course/build.gradle.kts
+++ b/ai-literacy-course/build.gradle.kts
@@ -19,12 +19,12 @@ pluginBuilder {
 
 android {
     namespace = "org.appdevforall.ailiteracycourse"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "org.appdevforall.ailiteracycourse"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/apk-viewer/build.gradle.kts b/apk-viewer/build.gradle.kts
index 765f3bd1..460265e0 100644
--- a/apk-viewer/build.gradle.kts
+++ b/apk-viewer/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "com.example.sampleplugin"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.example.sampleplugin"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/bookshelf/build.gradle.kts b/bookshelf/build.gradle.kts
index 339ac3cf..c0d11528 100644
--- a/bookshelf/build.gradle.kts
+++ b/bookshelf/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "org.appdevforall.bookshelfplugin"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "org.appdevforall.bookshelfplugin"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/client-time-tracker/build.gradle.kts b/client-time-tracker/build.gradle.kts
index bb8c2950..341278f4 100644
--- a/client-time-tracker/build.gradle.kts
+++ b/client-time-tracker/build.gradle.kts
@@ -14,12 +14,12 @@ pluginBuilder {
 
 android {
     namespace = "com.appdevforall.contractor.plugin"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.appdevforall.contractor.plugin"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/client-time-tracker/gradle/wrapper/gradle-wrapper.properties b/client-time-tracker/gradle/wrapper/gradle-wrapper.properties
index df97d72b..d4081da4 100644
--- a/client-time-tracker/gradle/wrapper/gradle-wrapper.properties
+++ b/client-time-tracker/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/client-time-tracker/settings.gradle.kts b/client-time-tracker/settings.gradle.kts
index 9862b68e..a5210d81 100644
--- a/client-time-tracker/settings.gradle.kts
+++ b/client-time-tracker/settings.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
     dependencies {
         classpath(files("../libs/plugin-api.jar"))
         classpath(files("../libs/gradle-plugin.jar"))
-        classpath("com.android.tools.build:gradle:8.8.2")
+        classpath("com.android.tools.build:gradle:8.11.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
     }
 }
diff --git a/code-suggestions-plugin/build.gradle.kts b/code-suggestions-plugin/build.gradle.kts
index af56914f..5ffe0761 100644
--- a/code-suggestions-plugin/build.gradle.kts
+++ b/code-suggestions-plugin/build.gradle.kts
@@ -10,12 +10,12 @@ pluginBuilder {
 
 android {
     namespace = "com.itsaky.androidide.plugins.codesuggestions"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.itsaky.androidide.plugins.codesuggestions"
         minSdk = 33
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/compose-preview/build.gradle.kts b/compose-preview/build.gradle.kts
index 12086457..6a7fb69e 100644
--- a/compose-preview/build.gradle.kts
+++ b/compose-preview/build.gradle.kts
@@ -11,12 +11,12 @@ pluginBuilder {
 
 android {
     namespace = "org.appdevforall.composepreview"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "org.appdevforall.composepreview"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
 
diff --git a/compose-preview/gradle/wrapper/gradle-wrapper.properties b/compose-preview/gradle/wrapper/gradle-wrapper.properties
index df97d72b..d4081da4 100644
--- a/compose-preview/gradle/wrapper/gradle-wrapper.properties
+++ b/compose-preview/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/compose-preview/settings.gradle.kts b/compose-preview/settings.gradle.kts
index 490288c7..1d1a6d2e 100644
--- a/compose-preview/settings.gradle.kts
+++ b/compose-preview/settings.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
     dependencies {
         classpath(files("../libs/plugin-api.jar"))
         classpath(files("../libs/gradle-plugin.jar"))
-        classpath("com.android.tools.build:gradle:8.8.2")
+        classpath("com.android.tools.build:gradle:8.11.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
         classpath("org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0")
     }
diff --git a/cotg-ndk/build.gradle.kts b/cotg-ndk/build.gradle.kts
index 5b0ad299..4a9134ad 100644
--- a/cotg-ndk/build.gradle.kts
+++ b/cotg-ndk/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "com.cotg.cotgndk"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.cotg.cotgndk"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 6
         versionName = "6.0.0"
     }
diff --git a/flutter-template/settings.gradle.kts b/flutter-template/settings.gradle.kts
index 0342a1b2..5de2bb66 100644
--- a/flutter-template/settings.gradle.kts
+++ b/flutter-template/settings.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
         classpath(files("../libs/plugin-api.jar"))
         classpath(files("../libs/gradle-plugin.jar"))
         classpath("com.android.tools.build:gradle:8.11.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
     }
 }
 
diff --git a/icons-repository/build.gradle.kts b/icons-repository/build.gradle.kts
index 82840a5b..1f594550 100644
--- a/icons-repository/build.gradle.kts
+++ b/icons-repository/build.gradle.kts
@@ -12,11 +12,11 @@ pluginBuilder {
 
 android {
     namespace = "dev.omar.plugin.iconsrepo"
-    compileSdk = 34
+    compileSdk = 36
     defaultConfig {
         applicationId = "dev.omar.plugin.iconsrepo"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/keystore-generator/build.gradle.kts b/keystore-generator/build.gradle.kts
index cd5c4349..45d07e86 100644
--- a/keystore-generator/build.gradle.kts
+++ b/keystore-generator/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "com.appdevforall.keygen.plugin"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.appdevforall.keygen.plugin"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/layout-editor/build.gradle.kts b/layout-editor/build.gradle.kts
index 98afaba1..7eb67da7 100644
--- a/layout-editor/build.gradle.kts
+++ b/layout-editor/build.gradle.kts
@@ -10,12 +10,12 @@ pluginBuilder {
 
 android {
     namespace = "org.appdevforall.codeonthego.layouteditor"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "org.appdevforall.codeonthego.layouteditor"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/layout-editor/gradle/wrapper/gradle-wrapper.properties b/layout-editor/gradle/wrapper/gradle-wrapper.properties
index df97d72b..d4081da4 100644
--- a/layout-editor/gradle/wrapper/gradle-wrapper.properties
+++ b/layout-editor/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/layout-editor/settings.gradle.kts b/layout-editor/settings.gradle.kts
index 8b717726..087f3668 100644
--- a/layout-editor/settings.gradle.kts
+++ b/layout-editor/settings.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
     dependencies {
         classpath(files("../libs/plugin-api.jar"))
         classpath(files("../libs/gradle-plugin.jar"))
-        classpath("com.android.tools.build:gradle:8.8.2")
+        classpath("com.android.tools.build:gradle:8.11.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
     }
 }
diff --git a/markdown-preview/build.gradle.kts b/markdown-preview/build.gradle.kts
index 5be08435..4e77ce0e 100644
--- a/markdown-preview/build.gradle.kts
+++ b/markdown-preview/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "com.codeonthego.markdownpreviewer"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.codeonthego.markdownpreviewer"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/ndk-installer-plugin/build.gradle.kts b/ndk-installer-plugin/build.gradle.kts
index 6d392a53..4715448f 100644
--- a/ndk-installer-plugin/build.gradle.kts
+++ b/ndk-installer-plugin/build.gradle.kts
@@ -17,12 +17,12 @@ pluginBuilder {
 
 android {
     namespace = "org.appdevforall.ndkinstaller"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "org.appdevforall.ndkinstaller"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/pebble-custom-function-template-installer/settings.gradle.kts b/pebble-custom-function-template-installer/settings.gradle.kts
index 07f43eaa..380415e1 100644
--- a/pebble-custom-function-template-installer/settings.gradle.kts
+++ b/pebble-custom-function-template-installer/settings.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
         classpath(files("libs/plugin-api.jar"))
         classpath(files("libs/gradle-plugin.jar"))
         classpath("com.android.tools.build:gradle:8.11.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
     }
 }
 
diff --git a/python-tools/build.gradle.kts b/python-tools/build.gradle.kts
index e5b21ba9..6948f123 100644
--- a/python-tools/build.gradle.kts
+++ b/python-tools/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "com.appdevforall.python.plugin"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.appdevforall.python.plugin"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/rainbow-on-the-go/build.gradle.kts b/rainbow-on-the-go/build.gradle.kts
index 905b9d62..4f24246b 100644
--- a/rainbow-on-the-go/build.gradle.kts
+++ b/rainbow-on-the-go/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "org.appdevforall.rainbowonthego"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "org.appdevforall.rainbowonthego"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/random-xkcd/build.gradle.kts b/random-xkcd/build.gradle.kts
index 12077797..e1447d9a 100644
--- a/random-xkcd/build.gradle.kts
+++ b/random-xkcd/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "org.appdevforall.randomxkcd"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "org.appdevforall.randomxkcd"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/sketch-to-ui-plugin/build.gradle.kts b/sketch-to-ui-plugin/build.gradle.kts
index d1e999a1..5ba26240 100644
--- a/sketch-to-ui-plugin/build.gradle.kts
+++ b/sketch-to-ui-plugin/build.gradle.kts
@@ -12,7 +12,7 @@ pluginBuilder {
 
 android {
     namespace = "com.appdevforall.sketchtoui.plugin"
-    compileSdk = 35
+    compileSdk = 36
 
     sourceSets {
         getByName("main") {
@@ -34,7 +34,7 @@ android {
     defaultConfig {
         applicationId = "com.appdevforall.sketchtoui.plugin"
         minSdk = 28
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/snippets/build.gradle.kts b/snippets/build.gradle.kts
index 31834263..804269fa 100644
--- a/snippets/build.gradle.kts
+++ b/snippets/build.gradle.kts
@@ -12,12 +12,12 @@ pluginBuilder {
 
 android {
     namespace = "com.codeonthego.snippets"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.codeonthego.snippets"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/speech-to-text-plugin/build.gradle.kts b/speech-to-text-plugin/build.gradle.kts
index 6f56f5f0..5f58595a 100644
--- a/speech-to-text-plugin/build.gradle.kts
+++ b/speech-to-text-plugin/build.gradle.kts
@@ -10,12 +10,12 @@ pluginBuilder {
 
 android {
     namespace = "com.itsaky.androidide.plugins.stt"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.itsaky.androidide.plugins.stt"
         minSdk = 33
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }
diff --git a/template-manager/build.gradle.kts b/template-manager/build.gradle.kts
index 4b0b2905..8e06a10d 100644
--- a/template-manager/build.gradle.kts
+++ b/template-manager/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -33,10 +35,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17 
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
     buildFeatures {
         viewBinding = true
     }
@@ -55,6 +53,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
     compileOnly(files("../libs/plugin-api.jar"))
 
@@ -88,7 +92,3 @@ tasks.matching {
 }.configureEach {
     enabled = false
 }
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = "17"
-}
diff --git a/template-manager/settings.gradle.kts b/template-manager/settings.gradle.kts
index 201a950e..365d7cd1 100644
--- a/template-manager/settings.gradle.kts
+++ b/template-manager/settings.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
         classpath(files("../libs/plugin-api.jar"))
         classpath(files("../libs/gradle-plugin.jar"))
         classpath("com.android.tools.build:gradle:8.11.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
     }
 }
 
diff --git a/vector-search-plugin/build.gradle.kts b/vector-search-plugin/build.gradle.kts
index 492c58b4..6a093b1b 100644
--- a/vector-search-plugin/build.gradle.kts
+++ b/vector-search-plugin/build.gradle.kts
@@ -10,12 +10,12 @@ pluginBuilder {
 
 android {
     namespace = "com.itsaky.androidide.plugins.vectorsearch"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.itsaky.androidide.plugins.vectorsearch"
         minSdk = 33
-        targetSdk = 34
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0.0"
     }