diff --git a/.gitignore b/.gitignore
index 8fe930ab..c509324f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 .gradle
+.kotlin
 build/
+chart.podspec
+yarn.lock
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 131c12d9..7bbb8bc1 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -1,15 +1,20 @@
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
-    id("org.jetbrains.compose")version "1.6.10"
+    id("org.jetbrains.compose")
     id("com.android.application")
     kotlin("android")
-    id ("org.jetbrains.kotlin.plugin.compose") version  "2.0.0"
+    id ("org.jetbrains.kotlin.plugin.compose") version("2.3.0")
 }
 
 group = "com.aay"
 version = "1.0"
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
@@ -38,3 +43,9 @@ android {
     }
 }
 
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+    }
+}
+
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 6fdfa1f1..fdde14e0 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.aay">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
             android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-        <activity android:name=".MainActivity" android:exported="true">
+        <activity android:name="com.aay.android.MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/build.gradle.kts b/build.gradle.kts
index c19b1f7e..c720f864 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,5 +13,4 @@ plugins {
     id("com.android.application") apply false
     id("com.android.library") apply false
     id("org.jetbrains.compose") apply false
-
 }
\ No newline at end of file
diff --git a/chart/build.gradle.kts b/chart/build.gradle.kts
index 5202dc2e..46ac8058 100644
--- a/chart/build.gradle.kts
+++ b/chart/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
@@ -15,13 +15,13 @@ group = "io.github.thechance101"
 version = "1.1.0"
 
 kotlin {
-    jvmToolchain {
-        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
-    }
-
     androidTarget {
         publishLibraryVariants("release")
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
     }
+
     jvm("desktop")
 
     iosX64 {
@@ -62,9 +62,8 @@ kotlin {
         binaries.executable()
     }
 
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "chart"
+        outputModuleName = "chart"
         browser {
             commonWebpackConfig {
                 outputFileName = "AAY-Chart.js"
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index a6070682..c9bd777a 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,6 +1,6 @@
-import org.jetbrains.compose.compose
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin)
@@ -13,13 +13,17 @@ group = "com.aay"
 version = "1.0-SNAPSHOT"
 
 kotlin {
-    android()
     jvm("desktop")
 
+    androidTarget {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+        }
+    }
+
     // WASM Target
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "composeApp"
+        outputModuleName = "composeApp"
         browser {
             commonWebpackConfig {
                 outputFileName = "AAY-Chart.js"
@@ -54,7 +58,7 @@ kotlin {
         }
 
         val wasmJsMain by getting {
-            dependencies{
+            dependencies {
                 api(compose.runtime)
                 api(compose.foundation)
                 api(compose.material)
@@ -72,7 +76,7 @@ android {
         targetSdkVersion(34)
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }
diff --git a/common/src/androidMain/AndroidManifest.xml b/common/src/androidMain/AndroidManifest.xml
index 18cb6c10..10728cc7 100644
--- a/common/src/androidMain/AndroidManifest.xml
+++ b/common/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.aay.common"/>
\ No newline at end of file
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
\ No newline at end of file
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 6d0d1bc6..b73d35d8 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -11,9 +11,7 @@ version = "1.0-SNAPSHOT"
 
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
 
     val osName = System.getProperty("os.name")
     val targetOs = when {
diff --git a/gradle.properties b/gradle.properties
index 1ef07066..eb6db29f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 kotlin.code.style=official
 android.useAndroidX=true
-kotlin.version=2.0.0
-agp.version=8.1.1
+kotlin.version=2.3.0
+agp.version=8.12.0
 compose.version=1.6.10
 org.jetbrains.compose.experimental.uikit.enabled=true
 xcodeproj=./iosApp
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a8a2936c..4c67021f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.3.0"
 compose = "1.6.10"
-composePlugin = "2.0.0"
+composePlugin = "2.3.0"
 appcompat = "1.7.0"
 coreKtx = "1.10.0"
 dokka = "1.5.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e411586a..ac57dd15 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/wasm/build.gradle.kts b/wasm/build.gradle.kts
index d2d26804..7873f44c 100644
--- a/wasm/build.gradle.kts
+++ b/wasm/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
@@ -8,9 +7,8 @@ plugins {
 }
 
 kotlin {
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "wasm"
+        outputModuleName = "wasm"
         browser {
             commonWebpackConfig {
                 outputFileName = "wasm.js"
@@ -33,7 +31,6 @@ kotlin {
                 implementation(compose.components.resources)
                 implementation(compose.components.uiToolingPreview)
             }
-
         }
     }
 }
\ No newline at end of file