Merge pull request #1017 from edusperoni/patch-2

EddyVerbruggen · web-flow · commit f6d018cb1c9b · 2018-11-09T17:11:21.000+01:00
Fix for when googlePlayServicesVersion is '+'
diff --git a/publish/scripts/installer.js b/publish/scripts/installer.js
@@ -690,7 +690,7 @@ repositories {
 def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"
 def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "16.0.1"
 
-if (VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.+')) {
+if (googlePlayServicesVersion != '+' && VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.+')) {
     throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.0 / 15.0.+ (currently set to $googlePlayServicesVersion)");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,7 @@ repositories {`
`690`	`690`	`def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"`
`691`	`691`	`def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "16.0.1"`
`692`	`692`
`693`		`-if (VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.+')) {`
	`693`	`+if (googlePlayServicesVersion != '+' && VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.+')) {`
`694`	`694`	`throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.0 / 15.0.+ (currently set to $googlePlayServicesVersion)");`
`695`	`695`	`}`
`696`	`696`