diff --git a/Armadillo/build.gradle b/Armadillo/build.gradle
index 6625f71..eea16dc 100644
--- a/Armadillo/build.gradle
+++ b/Armadillo/build.gradle
@@ -18,16 +18,16 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName project.LIBRARY_VERSION
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -44,6 +44,9 @@ android {
     }
 
     resourcePrefix 'arm'
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
diff --git a/build.gradle b/build.gradle
index 0f86ac0..275ab0b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     apply from: "$project.rootDir/gradle/shared.gradle"
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath "com.android.tools.build:gradle:$GRADLE_PLUGIN_VERSION"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 0813728..2afae25 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,7 @@ DAGGER_VERSION=2.16
 MAVEN_PUBLISH_VERSION=3.6.2
 DOKKA_VERSION=1.6.10
 SERIALIZATON_VERSION=1.4.1
-# Update package-list when updating build tools version
-BUILD_TOOLS_VERSION=29.0.3
+GRADLE_PLUGIN_VERSION=8.4.2
+BUILD_TOOLS_VERSION=31.0.0
 android.useAndroidX=true
 android.enableJetifier=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fc..510e4ef 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.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists