# Conflicts:

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

gradle.properties

@@ -1,6 +1,5 @@
 org.gradle.daemon=true
-#--illegal-access=permit
-org.gradle.jvmargs=-Xms256m -Xmx1024m
+org.gradle.jvmargs=-Xms256m -Xmx1024m --illegal-access=permit
 # Don't recompute annotations if sources haven't been changed
 kapt.incremental.apt = true
 # Multithreaded
@@ -9,4 +8,6 @@ kapt.use.worker.api=true
 kapt.include.compile.classpath=false
 # I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues
 kotlin.stdlib.default.dependency=false
-archash=3926b785320fea0cd9ca597f6bfa9071263a5464
+#needed for android compilation
+android.useAndroidX=true
+archash=07ced971f4c8b8b5a61aa3a84b29c90aa497cb48