diff --git a/adal/build.gradle b/adal/build.gradle
index 71c4a6569..d5ae7306d 100644
--- a/adal/build.gradle
+++ b/adal/build.gradle
@@ -189,7 +189,7 @@ task sourcesJar(type: Jar) {
 task javadoc(type: Javadoc) {
     failOnError false
     source = android.sourceSets.main.java.srcDirs
-    classpath += configurations.compile
+    classpath += configurations.implementation
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     classpath += configurations.javadocDeps
     exclude '**/*.aidl'
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index cb16ed0d5..ef65176fb 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -7,11 +7,10 @@ ext {
     automationAppMinSDKVersion = 21
     targetSdkVersion = 34
     compileSdkVersion = 34
-    automationAndTestAppCompileSDK = 33
     buildToolsVersion = "28.0.3"
 
     // Plugins
-    gradleVersion = '4.2.2'
+    gradleVersion = '7.4.2'
     kotlinVersion = '1.7.21'
     spotBugsGradlePluginVersion = '4.7.1'
     jupiterApiVersion = '5.6.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f08f3db3a..30f80bdcf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle
index 0588f9c85..bff91834e 100644
--- a/userappwithbroker/build.gradle
+++ b/userappwithbroker/build.gradle
@@ -42,7 +42,7 @@ if (project.hasProperty("buildApplicationId")) {
 println "Using application Id " + destApplicationId
 
 android {
-    compileSdkVersion rootProject.ext.automationAndTestAppCompileSDK
+    compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
         // Flag to enable support for the new language APIs