# Conflicts:

#	core/src/mindustry/mod/ClassMap.java

android/build.gradle

@@ -7,9 +7,7 @@ buildscript{
     }
 
     dependencies{
-        //IMPORTANT NOTICE: any version of the plugin after 3.4.1 will break builds
-        //it appears abstract methods don't get desugared properly (if at all)
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
     }
 }
 

android/src/mindustry/android/AndroidRhinoContext.java

@@ -62,13 +62,6 @@ public class AndroidRhinoContext{
             initApplicationClassLoader(createClassLoader(AndroidContextFactory.class.getClassLoader()));
         }
 
-        @Override
-        protected Context makeContext(){
-            Context ctx = super.makeContext();
-            ctx.setClassShutter(Scripts::allowClass);
-            return ctx;
-        }
-
         /**
          * Create a ClassLoader which is able to deal with bytecode
          * @param parent the parent of the create classloader