The disclosed embodiments provide a system that manages use of a battery corresponding to a high-voltage lithium-polymer battery in a portable electronic device. During operation, the system monitors a cycle number of the battery during use of the battery with the portable electronic device, wherein the cycle number corresponds to a number of charge-discharge cycles of the battery. If the cycle number exceeds one or more cycle number thresholds, the system modifies a charging technique for the battery to manage swelling in the battery and use of the battery with the portable electronic device.