Incorrect Google Play Services version check in include.gradle #894

EddyVerbruggen · EddyVerbruggen · commit 6ae0fb0100b0 · 2018-09-19T21:17:33.000+02:00
diff --git a/demo-push/app_resources/Android/app.gradle b/demo-push/app_resources/Android/app.gradle
@@ -5,6 +5,10 @@
 //	compile 'com.android.support:recyclerview-v7:+'
 //}
 
+//project.ext {
+//  googlePlayServicesVersion = "15.0.1"
+//}
+
 android {
   defaultConfig {
     generatedDensities = []
diff --git a/publish/scripts/installer.js b/publish/scripts/installer.js
@@ -573,8 +573,8 @@ repositories {
 def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"
 def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "15.0.1"
 
-if (VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.1')) {
-    throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.1 (currently set to $googlePlayServicesVersion)");
+if (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)");
 }
 
 dependencies {
diff --git a/src/scripts/postinstall.js b/src/scripts/postinstall.js
@@ -3371,8 +3371,8 @@ repositories {
 def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"
 def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "15.0.1"
 
-if (VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.1')) {
-    throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.1 (currently set to $googlePlayServicesVersion)");
+if (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)");
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -573,8 +573,8 @@ repositories {`
`573`	`573`	`def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"`
`574`	`574`	`def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "15.0.1"`
`575`	`575`
`576`		`-if (VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.1')) {`
`577`		`- throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.1 (currently set to $googlePlayServicesVersion)");`
	`576`	`+if (VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.+')) {`
	`577`	`+ throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.0 / 15.0.+ (currently set to $googlePlayServicesVersion)");`
`578`	`578`	`}`
`579`	`579`
`580`	`580`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -3371,8 +3371,8 @@ repositories {`
`3371`	`3371`	`def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "26.0.0"`
`3372`	`3372`	`def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : "15.0.1"`
`3373`	`3373`
`3374`		`-if (VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.1')) {`
`3375`		`- throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.1 (currently set to $googlePlayServicesVersion)");`
	`3374`	`+if (VersionNumber.parse(googlePlayServicesVersion) < VersionNumber.parse('15.0.+')) {`
	`3375`	`+ throw new GradleException(" googlePlayServicesVersion set too low, please update to at least 15.0.0 / 15.0.+ (currently set to $googlePlayServicesVersion)");`
`3376`	`3376`	`}`
`3377`	`3377`
`3378`	`3378`	`dependencies {`