mirror of
https://github.com/apache/cordova-android.git
synced 2026-04-23 00:00:09 +08:00
Improve Gradle Build Arguments (#699)
* Remove `uses-sdk` from AndroidManifest * Remove dependency `elementtree` * Updated Build Command Help Menu Printout * Cleanup `minSdkVersion` printout * Added `maxSdkVersion`, but not recommended to set. * Added `targetSdkVersion` * Update the `GradlePropertiesParser` & Test Spec * Always Set Overriding Changes * Update existing properties * Update configure method
This commit is contained in:
@@ -106,7 +106,7 @@ describe('Gradle Builder', () => {
|
||||
expect(emitSpy.calls.argsFor(0)[1]).toContain('Appending configuration item');
|
||||
});
|
||||
|
||||
it('should not detect missing defaults and not call set.', () => {
|
||||
it('should not detect missing defaults and call set.', () => {
|
||||
let setSpy = jasmine.createSpy('set');
|
||||
let getSpy = jasmine.createSpy('get').and.returnValue(true);
|
||||
|
||||
@@ -118,10 +118,10 @@ describe('Gradle Builder', () => {
|
||||
parser._configureProperties(parser._defaults);
|
||||
|
||||
expect(getSpy).toHaveBeenCalled();
|
||||
expect(setSpy).not.toHaveBeenCalled();
|
||||
expect(setSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should detect default with changed value.', () => {
|
||||
it('should detect default with changed value to match default and set.', () => {
|
||||
let setSpy = jasmine.createSpy('set');
|
||||
let getSpy = jasmine.createSpy('get').and.returnValue('-Xmx512m');
|
||||
|
||||
@@ -133,7 +133,23 @@ describe('Gradle Builder', () => {
|
||||
parser._configureProperties(parser._defaults);
|
||||
|
||||
expect(getSpy).toHaveBeenCalled();
|
||||
expect(setSpy).not.toHaveBeenCalled();
|
||||
expect(setSpy).toHaveBeenCalled();
|
||||
expect(emitSpy.calls.argsFor(0)[1]).toContain('Updating Gradle property');
|
||||
});
|
||||
|
||||
it('should detect default with changed value different from default and set.', () => {
|
||||
let setSpy = jasmine.createSpy('set');
|
||||
let getSpy = jasmine.createSpy('get').and.returnValue('-Xmx2048m');
|
||||
|
||||
parser.gradleFile = {
|
||||
set: setSpy,
|
||||
get: getSpy
|
||||
};
|
||||
|
||||
parser._configureProperties({ 'org.gradle.jvmargs': '-Xmx512m' });
|
||||
|
||||
expect(getSpy).toHaveBeenCalled();
|
||||
expect(setSpy).toHaveBeenCalled();
|
||||
expect(emitSpy.calls.argsFor(0)[1]).toContain('Cordova\'s recommended value is');
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user