diff options
| author | Mads Ager <ager@google.com> | 2018-11-27 00:10:49 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-27 00:10:49 -0800 |
| commit | ee97c923a8efccd2820672bb30a602570864d1d0 (patch) | |
| tree | b53dc391ba29dcd94edb29d059325c5dd35dde2d | |
| parent | e56892fef3a98f2a73f26ad293693ed2dd485265 (diff) | |
| parent | 1d9ec348fa2599545c60e00bcf901b20e474e4d7 (diff) | |
| download | multidex-ee97c923a8efccd2820672bb30a602570864d1d0.tar.gz | |
Do not use regexps to parse simple version strings. am: 44d3900a5d
am: 1d9ec348fa
Change-Id: I5d6c3a420887c5cd4653ac0c8fd9bebdaef1bea8
| -rw-r--r-- | library/src/androidx/multidex/MultiDex.java | 13 | ||||
| -rw-r--r-- | version.gradle | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/library/src/androidx/multidex/MultiDex.java b/library/src/androidx/multidex/MultiDex.java index 30cb886..c038709 100644 --- a/library/src/androidx/multidex/MultiDex.java +++ b/library/src/androidx/multidex/MultiDex.java @@ -38,8 +38,7 @@ import java.util.HashSet; import java.util.List; import java.util.ListIterator; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import java.util.StringTokenizer; import java.util.zip.ZipFile; /** @@ -334,11 +333,13 @@ public final class MultiDex { static boolean isVMMultidexCapable(String versionString) { boolean isMultidexCapable = false; if (versionString != null) { - Matcher matcher = Pattern.compile("(\\d+)\\.(\\d+)(\\.\\d+)?").matcher(versionString); - if (matcher.matches()) { + StringTokenizer tokenizer = new StringTokenizer(versionString, "."); + String majorToken = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null; + String minorToken = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null; + if (majorToken != null && minorToken != null) { try { - int major = Integer.parseInt(matcher.group(1)); - int minor = Integer.parseInt(matcher.group(2)); + int major = Integer.parseInt(majorToken); + int minor = Integer.parseInt(minorToken); isMultidexCapable = (major > VM_WITH_MULTIDEX_VERSION_MAJOR) || ((major == VM_WITH_MULTIDEX_VERSION_MAJOR) && (minor >= VM_WITH_MULTIDEX_VERSION_MINOR)); diff --git a/version.gradle b/version.gradle index 85e088f..dd05783 100644 --- a/version.gradle +++ b/version.gradle @@ -14,4 +14,4 @@ * limitations under the License. */ -ext.multidexVersion = '2.0.0' +ext.multidexVersion = '2.0.1' |