Add Android Build Settings

src/model/build-parameters.js

@@ -5,7 +5,11 @@ import Versioning from './versioning';
 
 class BuildParameters {
   static async create() {
-    const buildFile = this.parseBuildFile(Input.buildName, Input.targetPlatform);
+    const buildFile = this.parseBuildFile(
+      Input.buildName,
+      Input.targetPlatform,
+      Input.androidAppBundle,
+    );
     const buildVersion = await Versioning.determineVersion(
       Input.versioningStrategy,
       Input.specifiedVersion,
@@ -26,17 +30,22 @@ class BuildParameters {
       buildMethod: Input.buildMethod,
       buildVersion,
       androidVersionCode,
+      androidKeystoreName: Input.androidKeystoreName,
+      androidKeystoreBase64: Input.androidKeystoreBase64,
+      androidKeystorePass: Input.androidKeystorePass,
+      androidKeyaliasName: Input.androidKeyaliasName,
+      androidKeyaliasPass: Input.androidKeyaliasPass,
       customParameters: Input.customParameters,
     };
   }
 
-  static parseBuildFile(filename, platform) {
+  static parseBuildFile(filename, platform, androidAppBundle) {
     if (Platform.isWindows(platform)) {
       return `${filename}.exe`;
     }
 
     if (Platform.isAndroid(platform)) {
-      return `${filename}.apk`;
+      return androidAppBundle ? `${filename}.aab` : `${filename}.apk`;
     }
 
     return filename;

src/model/build-parameters.test.js

@@ -103,11 +103,21 @@ describe('BuildParameters', () => {
     test.each([Platform.types.Android])('appends apk for %s', async (targetPlatform) => {
       jest.spyOn(Input, 'targetPlatform', 'get').mockReturnValue(targetPlatform);
       jest.spyOn(Input, 'buildName', 'get').mockReturnValue(targetPlatform);
+      jest.spyOn(Input, 'androidAppBundle', 'get').mockReturnValue(false);
       await expect(BuildParameters.create()).resolves.toEqual(
         expect.objectContaining({ buildFile: `${targetPlatform}.apk` }),
       );
     });
 
+    test.each([Platform.types.Android])('appends aab for %s', async (targetPlatform) => {
+      jest.spyOn(Input, 'targetPlatform', 'get').mockReturnValue(targetPlatform);
+      jest.spyOn(Input, 'buildName', 'get').mockReturnValue(targetPlatform);
+      jest.spyOn(Input, 'androidAppBundle', 'get').mockReturnValue(true);
+      await expect(BuildParameters.create()).resolves.toEqual(
+        expect.objectContaining({ buildFile: `${targetPlatform}.aab` }),
+      );
+    });
+
     it('returns the build method', async () => {
       const mockValue = 'Namespace.ClassName.BuildMethod';
       jest.spyOn(Input, 'buildMethod', 'get').mockReturnValue(mockValue);
@@ -116,6 +126,46 @@ describe('BuildParameters', () => {
       );
     });
 
+    it('returns the android keystore name', async () => {
+      const mockValue = 'keystore.keystore';
+      jest.spyOn(Input, 'androidKeystoreName', 'get').mockReturnValue(mockValue);
+      await expect(BuildParameters.create()).resolves.toEqual(
+        expect.objectContaining({ androidKeystoreName: mockValue }),
+      );
+    });
+
+    it('returns the android keystore base64-encoded content', async () => {
+      const mockValue = 'secret';
+      jest.spyOn(Input, 'androidKeystoreBase64', 'get').mockReturnValue(mockValue);
+      await expect(BuildParameters.create()).resolves.toEqual(
+        expect.objectContaining({ androidKeystoreBase64: mockValue }),
+      );
+    });
+
+    it('returns the android keystore pass', async () => {
+      const mockValue = 'secret';
+      jest.spyOn(Input, 'androidKeystorePass', 'get').mockReturnValue(mockValue);
+      await expect(BuildParameters.create()).resolves.toEqual(
+        expect.objectContaining({ androidKeystorePass: mockValue }),
+      );
+    });
+
+    it('returns the android keyalias name', async () => {
+      const mockValue = 'secret';
+      jest.spyOn(Input, 'androidKeyaliasName', 'get').mockReturnValue(mockValue);
+      await expect(BuildParameters.create()).resolves.toEqual(
+        expect.objectContaining({ androidKeyaliasName: mockValue }),
+      );
+    });
+
+    it('returns the android keyalias pass', async () => {
+      const mockValue = 'secret';
+      jest.spyOn(Input, 'androidKeyaliasPass', 'get').mockReturnValue(mockValue);
+      await expect(BuildParameters.create()).resolves.toEqual(
+        expect.objectContaining({ androidKeyaliasPass: mockValue }),
+      );
+    });
+
     it('returns the custom parameters', async () => {
       const mockValue = '-profile SomeProfile -someBoolean -someValue exampleValue';
       jest.spyOn(Input, 'customParameters', 'get').mockReturnValue(mockValue);

src/model/docker.js

@@ -28,8 +28,13 @@ class Docker {
       buildFile,
       buildMethod,
       buildVersion,
-      customParameters,
       androidVersionCode,
+      androidKeystoreName,
+      androidKeystoreBase64,
+      androidKeystorePass,
+      androidKeyaliasName,
+      androidKeyaliasPass,
+      customParameters,
     } = parameters;
 
     const command = `docker run \
@@ -49,6 +54,11 @@ class Docker {
         --env BUILD_METHOD="${buildMethod}" \
         --env VERSION="${buildVersion}" \
         --env ANDROID_VERSION_CODE="${androidVersionCode}" \
+        --env ANDROID_KEYSTORE_NAME="${androidKeystoreName}" \
+        --env ANDROID_KEYSTORE_BASE64="${androidKeystoreBase64}" \
+        --env ANDROID_KEYSTORE_PASS="${androidKeystorePass}" \
+        --env ANDROID_KEYALIAS_NAME="${androidKeyaliasName}" \
+        --env ANDROID_KEYALIAS_PASS="${androidKeyaliasPass}" \
         --env CUSTOM_PARAMETERS="${customParameters}" \
         --env HOME=/github/home \
         --env GITHUB_REF \

src/model/input.js

@@ -45,6 +45,32 @@ class Input {
     return core.getInput('androidVersionCode');
   }
 
+  static get androidAppBundle() {
+    const input = core.getInput('androidAppBundle') || 'false';
+
+    return input === 'true' ? 'true' : 'false';
+  }
+
+  static get androidKeystoreName() {
+    return core.getInput('androidKeystoreName') || '';
+  }
+
+  static get androidKeystoreBase64() {
+    return core.getInput('androidKeystoreBase64') || '';
+  }
+
+  static get androidKeystorePass() {
+    return core.getInput('androidKeystorePass') || '';
+  }
+
+  static get androidKeyaliasName() {
+    return core.getInput('androidKeyaliasName') || '';
+  }
+
+  static get androidKeyaliasPass() {
+    return core.getInput('androidKeyaliasPass') || '';
+  }
+
   static get allowDirtyBuild() {
     const input = core.getInput('allowDirtyBuild') || 'false';
 

src/model/input.test.js

@@ -131,6 +131,89 @@ describe('Input', () => {
     });
   });
 
+  describe('androidAppBundle', () => {
+    it('returns the default value', () => {
+      expect(Input.androidAppBundle).toStrictEqual('false');
+    });
+
+    it('returns true when string true is passed', () => {
+      const spy = jest.spyOn(core, 'getInput').mockReturnValue('true');
+      expect(Input.androidAppBundle).toStrictEqual('true');
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+
+    it('returns false when string false is passed', () => {
+      const spy = jest.spyOn(core, 'getInput').mockReturnValue('false');
+      expect(Input.androidAppBundle).toStrictEqual('false');
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('androidKeystoreName', () => {
+    it('returns the default value', () => {
+      expect(Input.androidKeystoreName).toStrictEqual('');
+    });
+
+    it('takes input from the users workflow', () => {
+      const mockValue = 'keystore.keystore';
+      const spy = jest.spyOn(core, 'getInput').mockReturnValue(mockValue);
+      expect(Input.androidKeystoreName).toStrictEqual(mockValue);
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('androidKeystoreBase64', () => {
+    it('returns the default value', () => {
+      expect(Input.androidKeystoreBase64).toStrictEqual('');
+    });
+
+    it('takes input from the users workflow', () => {
+      const mockValue = 'secret';
+      const spy = jest.spyOn(core, 'getInput').mockReturnValue(mockValue);
+      expect(Input.androidKeystoreBase64).toStrictEqual(mockValue);
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('androidKeystorePass', () => {
+    it('returns the default value', () => {
+      expect(Input.androidKeystorePass).toStrictEqual('');
+    });
+
+    it('takes input from the users workflow', () => {
+      const mockValue = 'secret';
+      const spy = jest.spyOn(core, 'getInput').mockReturnValue(mockValue);
+      expect(Input.androidKeystorePass).toStrictEqual(mockValue);
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('androidKeyaliasName', () => {
+    it('returns the default value', () => {
+      expect(Input.androidKeyaliasName).toStrictEqual('');
+    });
+
+    it('takes input from the users workflow', () => {
+      const mockValue = 'secret';
+      const spy = jest.spyOn(core, 'getInput').mockReturnValue(mockValue);
+      expect(Input.androidKeyaliasName).toStrictEqual(mockValue);
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('androidKeyaliasPass', () => {
+    it('returns the default value', () => {
+      expect(Input.androidKeyaliasPass).toStrictEqual('');
+    });
+
+    it('takes input from the users workflow', () => {
+      const mockValue = 'secret';
+      const spy = jest.spyOn(core, 'getInput').mockReturnValue(mockValue);
+      expect(Input.androidKeyaliasPass).toStrictEqual(mockValue);
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe('allowDirtyBuild', () => {
     it('returns the default value', () => {
       expect(Input.allowDirtyBuild).toStrictEqual('false');