diff --git a/.github/workflows/build-and-upload-aar.yml b/.github/workflows/build-and-upload-aar.yml
new file mode 100644
index 0000000..c329705
--- /dev/null
+++ b/.github/workflows/build-and-upload-aar.yml
@@ -0,0 +1,32 @@
+name: Build and Upload AAR
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+
+      - name: Build AAR
+        run: ./gradlew sourceJar
+
+      - name: Upload AAR to Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: killerbee/build/outputs/aar/killerbee-release.aar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle b/build.gradle
index aadc6d1..cafc55b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.10.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -35,7 +35,7 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 
diff --git a/gradle.properties b/gradle.properties
index 98bed16..52c18a5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.nonTransitiveRClass=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c68..81aa1c0 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-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/killerbee/publish.gradle b/killerbee/publish.gradle
index 6eb8015..89e6588 100644
--- a/killerbee/publish.gradle
+++ b/killerbee/publish.gradle
@@ -8,9 +8,10 @@ def LIB_VERSION = '1.1.0'
 def githubProperties = new Properties()
 githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
 
-task sourceJar(type: Jar) {
+tasks.register('sourceJar', Jar) {
+    archiveClassifier = 'sources'
     from android.sourceSets.main.java.srcDirs
-    classifier "sources"
+    from android.sourceSets.main.kotlin.srcDirs
 }
 
 publishing {