kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to the latest Gradle 5.6.3 and Gradle Android plugin 3.5.1

Browse Source 
Fix issue with ANDROID_GRADLE_TASK. Set apk file  in separate folder ( from
gradle  4.x)
This commit is contained in:
flashultra
2019-10-29 10:04:46 +02:00
committed by Joshua Granick
parent 45e38dfca2
commit 72beeced30
5 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
templates/android/template/app/build.gradle
View File

@@ -66,19 +66,17 @@ android {
}
android.applicationVariants.all { variant ->
variant.outputs.each { output ->
def outputFile = output.outputFile
if (outputFile != null && outputFile.name.endsWith('.apk')) {
output.outputFile = new File(outputFile.parent, "::APP_FILE::-" + variant.buildType.name + ".apk")
variant.outputs.all { output ->
if (outputFileName != null && outputFileName.endsWith('.apk')) {
outputFileName = "::APP_FILE::-" + variant.buildType.name + ".apk"
}
}
}
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
::if (ANDROID_LIBRARY_PROJECTS)::::foreach (ANDROID_LIBRARY_PROJECTS)::compile project(':deps:::name::')
api fileTree(dir: 'libs', include: ['*.jar'])
::if (ANDROID_LIBRARY_PROJECTS)::::foreach (ANDROID_LIBRARY_PROJECTS)::api project(':deps:::name::')
::end::::end::
}

11
templates/android/template/build.gradle
View File

@@ -5,6 +5,9 @@ buildscript {
jcenter {
url "http://jcenter.bintray.com/"
}
maven {
url "https://maven.google.com/"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:::ANDROID_GRADLE_PLUGIN::'
@@ -30,7 +33,7 @@ task clean(type: Delete) {
delete rootProject.buildDir
}
task wrapper(type: Wrapper) {
wrapper {
gradleVersion = '::ANDROID_GRADLE_VERSION::'
}
@@ -38,7 +41,7 @@ configure(subprojects.findAll {!it.file('build.gradle').exists() && it.file('bui
buildscript {
repositories {
maven {
url "http://repo1.maven.org/maven2/"
url "https://maven.google.com/"
}
}
@@ -63,7 +66,7 @@ configure(subprojects.findAll {!it.file('build.gradle').exists() && it.file('bui
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':deps:extension-api')
api fileTree(dir: 'libs', include: ['*.jar'])
api project(':deps:extension-api')
}
}