gradle6.5バージョンアップ

ABVJE_Launcher_Android/build.gradle

@@ -133,15 +133,18 @@ android {
 }
 }
 
 
 import org.ajoberstar.grgit.*
 import org.ajoberstar.grgit.*
-task gitInfo << {
+task gitInfo {
+    doLast {
         description 'update githash.txt with current hash'
         description 'update githash.txt with current hash'
         def grgit = Grgit.open(project.file('..'))
         def grgit = Grgit.open(project.file('..'))
-    def gitfile=file('assets/githash.txt')
+        def gitfile = file('assets/githash.txt')
         gitfile.write grgit.head().id
         gitfile.write grgit.head().id
+    }
 }
 }
 preBuild.dependsOn gitInfo
 preBuild.dependsOn gitInfo
 
 
-task convertToPackage << {
+task convertToPackage {
+    doLast {
         description 'convert to package for google-services.json'
         description 'convert to package for google-services.json'
         def appModuleRootFolder = '.'
         def appModuleRootFolder = '.'
         def googleServicesJson = 'google-services.json'
         def googleServicesJson = 'google-services.json'
@@ -149,7 +152,8 @@ task convertToPackage << {
             from "fcm"
             from "fcm"
             include "$googleServicesJson"
             include "$googleServicesJson"
             into "$appModuleRootFolder"
             into "$appModuleRootFolder"
-        expand PACKAGE_NAME : app_custompackagename
+            expand PACKAGE_NAME: app_custompackagename
+        }
     }
     }
 }
 }
 preBuild.dependsOn convertToPackage
 preBuild.dependsOn convertToPackage

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     google()
     google()
   }
   }
   dependencies {
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.1.4'
+    classpath 'com.android.tools.build:gradle:4.1.0'
     // NOTE: Do not place your application dependencies here; they belong
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
     // in the individual module build.gradle files
   }
   }

gradle/wrapper/gradle-wrapper.properties

-#Tue Feb 19 17:59:22 JST 2019
+#Wed Mar 09 09:45:20 JST 2022
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip