Do not use different versionCodes when building bundleApks

haxenme · Jul 10, 2024 · 615c072 · 615c072
1 parent f08444f
commit 615c072
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/templates/android/PROJ-gradle/app/build.gradle b/templates/android/PROJ-gradle/app/build.gradle
@@ -121,6 +121,7 @@ dependencies {
     }
 }
 
+::if !NME_BUNDLE_RELEASE::
 /* Assigns a different version code for each output APK
     other than the universal APK. */
 
@@ -140,3 +141,4 @@ android.applicationVariants.all { variant ->
         }
     }
 }
+::end::
diff --git a/tools/nme/src/CommandLineTools.hx b/tools/nme/src/CommandLineTools.hx
@@ -1067,6 +1067,7 @@ class CommandLineTools
             {
                if (project.command!="uploadcrashlytics")
                   project.command = "build";
+               project.androidConfig.bundleApk = true;
             }
             words.splice(w,1);
             break;

diff --git a/tools/nme/src/platforms/AndroidPlatform.hx b/tools/nme/src/platforms/AndroidPlatform.hx
@@ -337,6 +337,7 @@ class AndroidPlatform extends Platform
 
       context.ABIS = [for(abi in includedABIs()) '"${abi.name}"'].join(', ');
       context.ABI_CODES = [for(abi in includedABIs()) '\'${abi.name}\':${abi.versionCodeScaler}'].join(', ');
+      context.NME_BUNDLE_RELEASE = project.androidConfig.bundleApk;
    }
 
    function getNdkStackExe()

diff --git a/tools/nme/src/project/NMEProject.hx b/tools/nme/src/project/NMEProject.hx
@@ -13,6 +13,7 @@ class AndroidConfig
    public var minApiLevel:Int;
    public var addV4Compat:Bool;
    public var universalApk:Bool;
+   public var bundleApk:Bool;
    public var targetApiLevel:Null<Int>;
    public var buildApiLevel:Null<Int>;
    public var appHeader:Array<String>;
@@ -34,6 +35,7 @@ class AndroidConfig
       minApiLevel = 21;
       addV4Compat = false;
       universalApk = false;
+      bundleApk = false;
       appHeader = [];
       appIntent = [];
       appActivity = [];