diff --git a/build.gradle b/build.gradle
index 09feb3183b..f93082e0fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -219,18 +219,13 @@ configure(project(":annotations")){
 //compile with java 8 compatibility for everything except the annotation project
 configure(subprojects - project(":annotations")){
     tasks.withType(JavaCompile){
-        options.compilerArgs.addAll(['--release', '8', '--enable-preview'])
-
-        doFirst{
-            options.compilerArgs = options.compilerArgs.findAll{it != '--enable-preview' }
-        }
+        options.compilerArgs.addAll(['--release', '8'])
     }
 
     tasks.withType(Javadoc){
         options{
             addStringOption('Xdoclint:none', '-quiet')
-            addBooleanOption('-enable-preview', true)
-            addStringOption('-release', '14')
+            addStringOption('-release', '16')
         }
     }
 }
@@ -297,9 +292,8 @@ project(":core"){
 
     kapt{
         javacOptions{
-            option("-source", "14")
+            option("-source", "16")
             option("-target", "1.8")
-            option("--enable-preview")
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 30f7da1b8d..8198f3fd92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-#suppresses a warning I don't care about
-android.disableAutomaticComponentCreation=true
 archash=3926b785320fea0cd9ca597f6bfa9071263a5464