Commit da3e5fe0 by onuma

gradle6.5バージョンアップ

parent 880b65ad
...@@ -133,23 +133,27 @@ android { ...@@ -133,23 +133,27 @@ android {
} }
import org.ajoberstar.grgit.* import org.ajoberstar.grgit.*
task gitInfo << { task gitInfo {
description 'update githash.txt with current hash' doLast {
def grgit = Grgit.open(project.file('..')) description 'update githash.txt with current hash'
def gitfile=file('assets/githash.txt') def grgit = Grgit.open(project.file('..'))
gitfile.write grgit.head().id def gitfile = file('assets/githash.txt')
gitfile.write grgit.head().id
}
} }
preBuild.dependsOn gitInfo preBuild.dependsOn gitInfo
task convertToPackage << { task convertToPackage {
description 'convert to package for google-services.json' doLast {
def appModuleRootFolder = '.' description 'convert to package for google-services.json'
def googleServicesJson = 'google-services.json' def appModuleRootFolder = '.'
copy { def googleServicesJson = 'google-services.json'
from "fcm" copy {
include "$googleServicesJson" from "fcm"
into "$appModuleRootFolder" include "$googleServicesJson"
expand PACKAGE_NAME : app_custompackagename into "$appModuleRootFolder"
expand PACKAGE_NAME: app_custompackagename
}
} }
} }
preBuild.dependsOn convertToPackage preBuild.dependsOn convertToPackage
......
...@@ -6,7 +6,7 @@ buildscript { ...@@ -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
} }
......
#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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment