diff --git a/FluentUI.Demo/build.gradle b/FluentUI.Demo/build.gradle
index a9db08acf..e247f2a84 100644
--- a/FluentUI.Demo/build.gradle
+++ b/FluentUI.Demo/build.gradle
@@ -2,10 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-
-apply plugin: 'com.android.application'
-
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
     compileSdkVersion constants.compileSdkVersion
@@ -17,9 +17,6 @@ android {
         versionName '0.3.9'
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         viewBinding true
         compose true
@@ -28,12 +25,8 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    lintOptions {
-        lintConfig = file("lint.xml")
-        abortOnError false
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildTypes {
         release {
@@ -62,7 +55,7 @@ android {
         }
     }
     testOptions {
-        unitTests{
+        unitTests {
             includeAndroidResources = true
         }
         unitTests.all {
@@ -74,6 +67,14 @@ android {
             }
         }
     }
+    namespace 'com.microsoft.fluentuidemo'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -94,9 +95,9 @@ dependencies {
     //Compose BOM
     implementation platform("androidx.compose:compose-bom:$composeBomVersion")
     implementation "androidx.compose.ui:ui"
-    implementation ("androidx.compose.foundation:foundation-layout")
-    implementation ("androidx.compose.material:material")
-    implementation ("androidx.activity:activity-compose:$composeActivityVersion")
+    implementation("androidx.compose.foundation:foundation-layout")
+    implementation("androidx.compose.material:material")
+    implementation("androidx.activity:activity-compose:$composeActivityVersion")
     implementation "androidx.test.ext:junit-ktx:$junitKtxVersion"
     implementation "androidx.test.uiautomator:uiautomator:$uiautomatorVersion"
     androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeTestVersion")
diff --git a/FluentUI.Demo/src/main/AndroidManifest.xml b/FluentUI.Demo/src/main/AndroidManifest.xml
index d937e187a..27da6fb3e 100644
--- a/FluentUI.Demo/src/main/AndroidManifest.xml
+++ b/FluentUI.Demo/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentuidemo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/FluentUI/build.gradle b/FluentUI/build.gradle
index 8acde506d..5cc992000 100644
--- a/FluentUI/build.gradle
+++ b/FluentUI/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -13,8 +15,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.FluentUI_version_code
-        versionName project.ext.FluentUI_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
 
@@ -30,12 +30,19 @@ android {
             mavenCentral()
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     lint {
         baseline = file("lint-baseline.xml")
-    }
-    lintOptions {
         abortOnError false
     }
+    namespace 'com.microsoft.fluentui_container'
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -67,9 +74,9 @@ dependencies {
     implementation platform("androidx.compose:compose-bom:$composeBomVersion")
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/FluentUI/src/main/AndroidManifest.xml b/FluentUI/src/main/AndroidManifest.xml
index 2c3509627..260ddcbbc 100644
--- a/FluentUI/src/main/AndroidManifest.xml
+++ b/FluentUI/src/main/AndroidManifest.xml
@@ -4,5 +4,4 @@
   ~ Licensed under the MIT License.
   -->
 <!-- TODO Change package name to com.microsoft.fluentui once modularization is complete -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui_container" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/build.gradle b/build.gradle
index 437c8a3b8..ec09a54b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.11.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:$nexus_plugin_version"
         classpath "com.microsoft.hydralab:gradle_plugin:$hydra_client_plugin"
diff --git a/fluentui_calendar/build.gradle b/fluentui_calendar/build.gradle
index 339947952..04194e9f2 100644
--- a/fluentui_calendar/build.gradle
+++ b/fluentui_calendar/build.gradle
@@ -2,9 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -14,23 +15,22 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_calendar_version_code
-        versionName project.ext.fluentui_calendar_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
     }
     buildFeatures {
         viewBinding true
     }
-    lintOptions {
-        abortOnError false
-    }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -38,6 +38,14 @@ android {
     }
     productFlavors {
     }
+    namespace 'com.microsoft.fluentui.calendar'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 gradle.taskGraph.whenReady { taskGraph ->
@@ -62,9 +70,9 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_calendar/src/main/AndroidManifest.xml b/fluentui_calendar/src/main/AndroidManifest.xml
index fdf69949b..a5918e68a 100644
--- a/fluentui_calendar/src/main/AndroidManifest.xml
+++ b/fluentui_calendar/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.calendar">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/fluentui_ccb/build.gradle b/fluentui_ccb/build.gradle
index 9475fdd3a..5c7032264 100644
--- a/fluentui_ccb/build.gradle
+++ b/fluentui_ccb/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -13,8 +15,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_ccb_version_code
-        versionName project.ext.fluentui_ccb_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -24,8 +24,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     composeOptions {
         kotlinCompilerExtensionVersion composeCompilerVersion
@@ -33,11 +34,16 @@ android {
     buildFeatures {
         compose true
     }
-    lintOptions {
+    namespace 'com.microsoft.fluentui.ccb'
+    lint {
         abortOnError false
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':fluentui_core')
@@ -57,9 +63,9 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout-compose:$constraintLayoutComposeVersion")
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_ccb/src/main/AndroidManifest.xml b/fluentui_ccb/src/main/AndroidManifest.xml
index 3c4ab5aaf..94cbbcfc3 100644
--- a/fluentui_ccb/src/main/AndroidManifest.xml
+++ b/fluentui_ccb/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.ccb" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/fluentui_controls/build.gradle b/fluentui_controls/build.gradle
index 41d94ea5d..3dacd86e8 100644
--- a/fluentui_controls/build.gradle
+++ b/fluentui_controls/build.gradle
@@ -1,5 +1,7 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -9,13 +11,8 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_controls_version_code
-        versionName project.ext.fluentui_controls_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
-    lintOptions {
-        abortOnError false
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -29,9 +26,6 @@ android {
     }
     productFlavors {
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         compose true
     }
@@ -39,9 +33,17 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
+    namespace 'com.microsoft.fluentui.controls'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -63,9 +65,9 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_controls/src/main/AndroidManifest.xml b/fluentui_controls/src/main/AndroidManifest.xml
index cad8a9bd4..25545c3bb 100644
--- a/fluentui_controls/src/main/AndroidManifest.xml
+++ b/fluentui_controls/src/main/AndroidManifest.xml
@@ -4,5 +4,4 @@
   ~ Licensed under the MIT License.
   -->
 
-<manifest
-    package="com.microsoft.fluentui.controls" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/fluentui_core/build.gradle b/fluentui_core/build.gradle
index 89293d399..e1420c0ea 100644
--- a/fluentui_core/build.gradle
+++ b/fluentui_core/build.gradle
@@ -2,10 +2,11 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-parcelize'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -15,8 +16,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_core_version_code
-        versionName project.ext.fluentui_core_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
     }
@@ -33,11 +32,8 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     testOptions {
         unitTests {
@@ -48,10 +44,13 @@ android {
     }
     lint {
         baseline = file("lint-baseline.xml")
-    }
-    lintOptions {
         abortOnError false
     }
+    namespace 'com.microsoft.fluentui.core'
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 gradle.taskGraph.whenReady { taskGraph ->
@@ -96,9 +95,9 @@ dependencies {
     implementation "androidx.compose.runtime:runtime-livedata"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_core/src/main/AndroidManifest.xml b/fluentui_core/src/main/AndroidManifest.xml
index c353ba146..211ad8f09 100644
--- a/fluentui_core/src/main/AndroidManifest.xml
+++ b/fluentui_core/src/main/AndroidManifest.xml
@@ -3,5 +3,4 @@
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.core" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/fluentui_drawer/build.gradle b/fluentui_drawer/build.gradle
index abe58f744..a3642185f 100644
--- a/fluentui_drawer/build.gradle
+++ b/fluentui_drawer/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -17,8 +19,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_drawer_version_code
-        versionName project.ext.fluentui_drawer_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -32,17 +32,19 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    lintOptions {
+    namespace 'com.microsoft.fluentui.drawer'
+    lint {
         abortOnError false
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':fluentui_core')
@@ -63,9 +65,9 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout-compose:$constraintLayoutComposeVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_drawer/src/main/AndroidManifest.xml b/fluentui_drawer/src/main/AndroidManifest.xml
index 3e5684634..211ad8f09 100644
--- a/fluentui_drawer/src/main/AndroidManifest.xml
+++ b/fluentui_drawer/src/main/AndroidManifest.xml
@@ -3,5 +3,4 @@
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.drawer" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/fluentui_icons/build.gradle b/fluentui_icons/build.gradle
index 28bb09687..11e314a63 100644
--- a/fluentui_icons/build.gradle
+++ b/fluentui_icons/build.gradle
@@ -1,5 +1,7 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -9,13 +11,8 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_icons_version_code
-        versionName project.ext.fluentui_icons_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
-    lintOptions {
-        abortOnError false
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -29,9 +26,6 @@ android {
     }
     productFlavors {
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         compose true
     }
@@ -39,9 +33,17 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
+    namespace 'com.microsoft.fluentui_icons'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -55,9 +57,9 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_icons/src/main/AndroidManifest.xml b/fluentui_icons/src/main/AndroidManifest.xml
index efc985db5..44008a433 100644
--- a/fluentui_icons/src/main/AndroidManifest.xml
+++ b/fluentui_icons/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.microsoft.fluentui_icons">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/fluentui_listitem/build.gradle b/fluentui_listitem/build.gradle
index 89b9693fd..06723cb0b 100644
--- a/fluentui_listitem/build.gradle
+++ b/fluentui_listitem/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -13,8 +15,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_listitem_version_code
-        versionName project.ext.fluentui_listitem_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -24,9 +24,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         compose true
     }
@@ -34,14 +31,19 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    lintOptions {
+    namespace 'com.microsoft.fluentui.listitem'
+    lint {
         abortOnError false
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':fluentui_core')
@@ -59,9 +61,9 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout-compose:$constraintLayoutComposeVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_listitem/src/main/AndroidManifest.xml b/fluentui_listitem/src/main/AndroidManifest.xml
index edc34759b..211ad8f09 100644
--- a/fluentui_listitem/src/main/AndroidManifest.xml
+++ b/fluentui_listitem/src/main/AndroidManifest.xml
@@ -3,5 +3,4 @@
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.listitem" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/fluentui_menus/build.gradle b/fluentui_menus/build.gradle
index cf6f0b9d8..36e951e93 100644
--- a/fluentui_menus/build.gradle
+++ b/fluentui_menus/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -13,8 +15,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_menus_version_code
-        versionName project.ext.fluentui_menus_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -27,14 +27,23 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     buildFeatures {
         compose true
     }
-    lintOptions {
+    namespace 'com.microsoft.fluentui.menus'
+    lint {
         abortOnError false
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':fluentui_core')
@@ -50,9 +59,9 @@ dependencies {
     implementation("androidx.compose.ui:ui")
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_menus/src/main/AndroidManifest.xml b/fluentui_menus/src/main/AndroidManifest.xml
index 8ffaddaf1..498bc8944 100644
--- a/fluentui_menus/src/main/AndroidManifest.xml
+++ b/fluentui_menus/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.menus">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/fluentui_notification/build.gradle b/fluentui_notification/build.gradle
index e86d09a21..989fee2d6 100644
--- a/fluentui_notification/build.gradle
+++ b/fluentui_notification/build.gradle
@@ -1,5 +1,7 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -9,13 +11,8 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_notification_version_code
-        versionName project.ext.fluentui_notification_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
-    lintOptions {
-        abortOnError false
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -29,9 +26,6 @@ android {
     }
     productFlavors {
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         compose true
     }
@@ -39,9 +33,17 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
+    namespace 'com.microsoft.fluentui.notification'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -64,9 +66,9 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_notification/src/main/AndroidManifest.xml b/fluentui_notification/src/main/AndroidManifest.xml
index 11d495868..25545c3bb 100644
--- a/fluentui_notification/src/main/AndroidManifest.xml
+++ b/fluentui_notification/src/main/AndroidManifest.xml
@@ -4,5 +4,4 @@
   ~ Licensed under the MIT License.
   -->
 
-<manifest
-    package="com.microsoft.fluentui.notification" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/fluentui_others/build.gradle b/fluentui_others/build.gradle
index cac516032..153d37716 100644
--- a/fluentui_others/build.gradle
+++ b/fluentui_others/build.gradle
@@ -2,9 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -14,13 +15,8 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_others_version_code
-        versionName project.ext.fluentui_others_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
-    lintOptions {
-        abortOnError false
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -33,6 +29,10 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     testOptions {
         unitTests {
             includeAndroidResources = true
@@ -40,6 +40,14 @@ android {
     }
     productFlavors {
     }
+    namespace 'com.microsoft.fluentui'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 gradle.taskGraph.whenReady { taskGraph ->
@@ -67,9 +75,9 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_others/src/main/AndroidManifest.xml b/fluentui_others/src/main/AndroidManifest.xml
index b0c12b398..a87e153ff 100644
--- a/fluentui_others/src/main/AndroidManifest.xml
+++ b/fluentui_others/src/main/AndroidManifest.xml
@@ -4,5 +4,4 @@
   ~ Licensed under the MIT License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/fluentui_peoplepicker/build.gradle b/fluentui_peoplepicker/build.gradle
index 52dbd1117..b01a0067c 100644
--- a/fluentui_peoplepicker/build.gradle
+++ b/fluentui_peoplepicker/build.gradle
@@ -2,9 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -14,8 +15,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_peoplepicker_version_code
-        versionName project.ext.fluentui_peoplepicker_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
     }
@@ -23,9 +22,6 @@ android {
         viewBinding true
         compose true
     }
-    lintOptions {
-        abortOnError false
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -36,11 +32,8 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildFeatures {
         compose true
@@ -52,6 +45,14 @@ android {
     }
     productFlavors {
     }
+    namespace 'com.microsoft.fluentui.peoplepicker'
+    lint {
+        abortOnError false
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 gradle.taskGraph.whenReady { taskGraph ->
@@ -83,9 +84,9 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_peoplepicker/src/main/AndroidManifest.xml b/fluentui_peoplepicker/src/main/AndroidManifest.xml
index 46e16c98a..a5918e68a 100644
--- a/fluentui_peoplepicker/src/main/AndroidManifest.xml
+++ b/fluentui_peoplepicker/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.peoplepicker">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/fluentui_persona/build.gradle b/fluentui_persona/build.gradle
index 97a409aaf..2befda2c2 100644
--- a/fluentui_persona/build.gradle
+++ b/fluentui_persona/build.gradle
@@ -2,9 +2,11 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-parcelize'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -18,8 +20,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_persona_version_code
-        versionName project.ext.fluentui_persona_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -46,11 +46,8 @@ android {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     testOptions {
         unitTests {
@@ -59,12 +56,17 @@ android {
     }
     productFlavors {
     }
-    lintOptions {
+    namespace 'com.microsoft.fluentui.persona'
+    lint {
         abortOnError false
     }
 
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':fluentui_core')
@@ -84,9 +86,9 @@ dependencies {
     implementation("androidx.compose.ui:ui")
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_persona/src/main/AndroidManifest.xml b/fluentui_persona/src/main/AndroidManifest.xml
index 2a9ccd87c..a5918e68a 100644
--- a/fluentui_persona/src/main/AndroidManifest.xml
+++ b/fluentui_persona/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.persona">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/fluentui_progress/build.gradle b/fluentui_progress/build.gradle
index 9bdb0b224..366e22e93 100644
--- a/fluentui_progress/build.gradle
+++ b/fluentui_progress/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -16,11 +18,13 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_progress_version_code
-        versionName project.ext.fluentui_progress_versionid
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         consumerProguardFiles "consumer-rules.pro"
@@ -31,15 +35,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
+    namespace 'com.microsoft.fluentui.progress'
+    lint {
+        abortOnError false
     }
     buildFeatures {
         compose true
     }
-    lintOptions {
-        abortOnError false
-    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -58,9 +64,9 @@ dependencies {
     implementation("androidx.compose.ui:ui")
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_progress/src/main/AndroidManifest.xml b/fluentui_progress/src/main/AndroidManifest.xml
index a34602b5c..a5918e68a 100644
--- a/fluentui_progress/src/main/AndroidManifest.xml
+++ b/fluentui_progress/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.progress">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/fluentui_tablayout/build.gradle b/fluentui_tablayout/build.gradle
index b62186ccb..93f17e44b 100644
--- a/fluentui_tablayout/build.gradle
+++ b/fluentui_tablayout/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -13,8 +15,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_tablayout_version_code
-        versionName project.ext.fluentui_tablayout_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -24,20 +24,26 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         compose true
     }
     composeOptions {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
-    lintOptions {
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    namespace 'com.microsoft.fluentui.tablayout'
+    lint {
         abortOnError false
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':fluentui_core')
@@ -57,9 +63,9 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_tablayout/src/main/AndroidManifest.xml b/fluentui_tablayout/src/main/AndroidManifest.xml
index 61758d734..211ad8f09 100644
--- a/fluentui_tablayout/src/main/AndroidManifest.xml
+++ b/fluentui_tablayout/src/main/AndroidManifest.xml
@@ -3,5 +3,4 @@
   ~ Copyright (c) Microsoft Corporation. All rights reserved.
   ~ Licensed under the MIT License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.tablayout" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/fluentui_topappbars/build.gradle b/fluentui_topappbars/build.gradle
index 0a2fdef00..83c40dda7 100644
--- a/fluentui_topappbars/build.gradle
+++ b/fluentui_topappbars/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -17,8 +19,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_topappbars_version_code
-        versionName project.ext.fluentui_topappbars_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
         vectorDrawables.useSupportLibrary = true
@@ -32,18 +32,22 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    lintOptions {
+
+    namespace 'com.microsoft.fluentui.topappbars'
+    lint {
         abortOnError false
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':fluentui_core')
@@ -63,9 +67,9 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
diff --git a/fluentui_topappbars/src/main/AndroidManifest.xml b/fluentui_topappbars/src/main/AndroidManifest.xml
index b65804843..a5918e68a 100644
--- a/fluentui_topappbars/src/main/AndroidManifest.xml
+++ b/fluentui_topappbars/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.topappbars">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/fluentui_transients/build.gradle b/fluentui_transients/build.gradle
index 065d18d43..0f778e446 100644
--- a/fluentui_transients/build.gradle
+++ b/fluentui_transients/build.gradle
@@ -2,8 +2,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 apply from: '../config.gradle'
 apply from: '../publish.gradle'
@@ -16,8 +18,6 @@ android {
     defaultConfig {
         minSdkVersion constants.minSdkVersion
         targetSdkVersion constants.targetSdkVersion
-        versionCode project.ext.fluentui_transients_version_code
-        versionName project.ext.fluentui_transients_versionid
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -27,9 +27,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions {
+    namespace 'com.microsoft.fluentui.transients'
+    lint {
         abortOnError false
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {
@@ -42,11 +52,11 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 }
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    archiveClassifier.set("sources")
 }
 
 project.afterEvaluate {
     project.ext.publishingFunc('fluentui_transients')
-}
\ No newline at end of file
+}
diff --git a/fluentui_transients/src/main/AndroidManifest.xml b/fluentui_transients/src/main/AndroidManifest.xml
index b4e38e70e..a5918e68a 100644
--- a/fluentui_transients/src/main/AndroidManifest.xml
+++ b/fluentui_transients/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.microsoft.fluentui.transients">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 242dc1faf..ecc0fb933 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,6 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.jetifier.ignorelist=bcprov-jdk18on
 org.gradle.jvmargs=-XX\:MaxHeapSize\=256m -Dkotlin.daemon.jvm.options\="-Xmx2048M" -Xmx2048M
+android.nonTransitiveRClass=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9cd60ce6e..3e396fa74 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jul 25 14:53:36 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME