Skip to content

Commit 965007a

Browse files
author
Tim Baverstock
committed
Fix nullable qualifier, and build
1 parent b2542c9 commit 965007a

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ Read more about the App Bundle format and Bundletool's usage at
2424
Documentation of bundletool commands can be found at:
2525
https://developer.android.com/studio/command-line/bundletool
2626

27+
## Build
28+
29+
Build with: ./gradlew executableJar
30+
2731
## Releases
2832

2933
Latest release: [0.10.1](https://github.com/google/bundletool/releases)

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
1+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStorePath=wrapper/dists

src/main/java/com/android/tools/build/bundletool/model/version/Version.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,13 @@ public static Version of(String version) {
7171
.build();
7272
}
7373

74+
String nullableQualifier = matcher.group("qualifier");
7475
return Version.builder()
7576
.setFullVersion(version)
7677
.setMajorVersion(Integer.parseInt(matcher.group("major")))
7778
.setMinorVersion(Integer.parseInt(matcher.group("minor")))
7879
.setRevisionVersion(Integer.parseInt(matcher.group("revision")))
79-
.setQualifier(matcher.group("qualifier"))
80+
.setQualifier(nullableQualifier != null ? nullableQualifier : "")
8081
.build();
8182
}
8283

0 commit comments

Comments
 (0)