From 8f43d5caccddb9890cfb225a1dd612d02493cf56 Mon Sep 17 00:00:00 2001 From: Steve Hannah Date: Sat, 25 Nov 2023 05:31:13 -0800 Subject: [PATCH] fix: disable play flag when using gradle 8 in android local builds When using gradle 8, the old play flag, which enables a common base set of play services with an old default play version, does not work. This disables this flag automatically when using gradle 8. --- .../main/java/com/codename1/builders/AndroidGradleBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java b/maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java index 78bf1903b0..30138d313b 100644 --- a/maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java +++ b/maven/codenameone-maven-plugin/src/main/java/com/codename1/builders/AndroidGradleBuilder.java @@ -1330,7 +1330,8 @@ public void usesClassMethod(String cls, String method) { // if a flag is declared we don't want the default play flag to be true - if(request.getArg("android.playService.plus", null) != null || + if(useGradle8 || + request.getArg("android.playService.plus", null) != null || request.getArg("android.playService.auth", (googleServicesJson.exists()) ? "true":null) != null || request.getArg("android.playService.base", null) != null || request.getArg("android.playService.identity", null) != null ||