Migrating IITC Mobile to SDK 28, fixed issues with new intel URL

build.py

@@ -59,9 +59,6 @@
 resourceUrlBase = settings.get('resourceUrlBase')
 distUrlBase = settings.get('distUrlBase')
 buildMobile = settings.get('buildMobile')
-antOptions = settings.get('antOptions','')
-antBuildFile = settings.get('antBuildFile', 'mobile/build.xml');
-
 
 # plugin wrapper code snippets. handled as macros, to ensure that
 # 1. indentation caused by the "function wrapper()" doesn't apply to the plugin code body
@@ -288,13 +285,15 @@ def saveScriptAndMeta(script,ourDir,filename,oldDir=None):
 
     if buildMobile != 'copyonly':
         # now launch 'ant' to build the mobile project
-        retcode = os.system("ant %s -buildfile %s %s" % (antOptions, antBuildFile, buildMobile))
+        flavors = {'debug': 'assembleDebug', 'release': 'assembleRelease'}
+        retcode = os.system("java -cp mobile/gradle/wrapper/gradle-wrapper.jar org.gradle.wrapper.GradleWrapperMain -p mobile clean " + flavors[buildMobile])
 
         if retcode != 0:
-            print ("Error: mobile app failed to build. ant returned %d" % retcode)
+            print ("Error: mobile app failed to build. gradle returned %d" % retcode)
             exit(1) # ant may return 256, but python seems to allow only values <256
         else:
-            shutil.copy("mobile/bin/IITC_Mobile-%s.apk" % buildMobile, os.path.join(outDir,"IITC_Mobile-%s.apk" % buildMobile) )
+            shutil.copy("mobile/iitcm/build/outputs/apk/%s/com.cradle.iitc_mobile-debug.apk" % buildMobile, os.path.join(outDir,"IITC_Mobile-%s.apk" % buildMobile) 
+)
 
 
 # run any postBuild commands

mobile/.gitignore

@@ -1,37 +1,6 @@
-.settings/
-assets/total-conversion-build.user.js
-assets/user-location.user.js
-assets/plugins/
-
-# built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-out/
-
-# private ant configs
-ant.properties
-
-# Local configuration file (sdk path, etc)
+.gradle
+.idea
+*.iml
 local.properties
-
-# Eclipse project files
-.classpath
-.project
-
-# IntelliJ IDEA user settings
-*.iws
-.idea/workspace.xml
-.idea/tasks.xml
-
-# Proguard logs
-proguard_logs/
+signing.properties
+.DS_Store

mobile/HACKING.md

@@ -24,7 +24,7 @@ Debugging IITC(M) **before** it has booted requires the Android Developer Tools.
 Building the APK
 ----------------
 
-- **ant:**
+- **gradle:**
   Set the ANDROID_HOME environment variable:
   ```export ANDROID_HOME=/path/to/android_sdk```
   Then build the app via the build.py script ```./build.py mobile```