diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
index 1e58d9b20d..f997dd749b 100644
--- a/MPChartLib/build.gradle
+++ b/MPChartLib/build.gradle
@@ -6,18 +6,21 @@ android {
     defaultConfig {
         compileSdk 33
         minSdkVersion 14
-        targetSdkVersion 33
     }
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     testOptions {
-        unitTests.returnDefaultValues = true // this prevents "not mocked" error
+        unitTests.returnDefaultValues = true
+        targetSdk 33// this prevents "not mocked" error
     }
     namespace 'com.github.mikephil.charting'
+    lint {
+        targetSdk 33
+    }
 }
 
 dependencies {
@@ -34,7 +37,7 @@ task javadoc(type: Javadoc) {
     options.charSet = 'UTF-8'
     failOnError false
     source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    classpath += project.files(androidComponents.sdkComponents.bootClasspath)
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
diff --git a/gradle.properties b/gradle.properties
index 8ac898b301..964eb36626 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ android.enableJetifier=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8