Skip to content
Permalink
Browse files

Upgraded to Gradle 5.1; fixed two issues, caused by the changes of th…

…e version upgrade; RESULT: build succeeds on Ubuntu 18.04 with openJDK 11; version details see below

Gradle        5.1
Build time:   2019-01-02 18:57:47 UTC
Revision:     d09c2e354576ac41078c322815cc6db2b66d976e

Kotlin DSL:   1.1.0
Kotlin:       1.3.11
Groovy:       2.5.4
Ant:          Apache Ant(TM) version 1.9.13 compiled on July 10 2018
JVM:          11.0.2 (Oracle Corporation 11.0.2+9-Ubuntu-3ubuntu118.04.3)
OS:           Linux 4.15.0-47-generic amd64
Distro:       Ubuntu 18.04.2 LTS
  • Loading branch information...
gnanet authored and JesusFreke committed May 5, 2019
1 parent 76867f0 commit c70a7008f67377352ced23544373e97ae80db43b
@@ -185,7 +185,7 @@ buildscript {
}
}

task wrapper(type: Wrapper) {
gradleVersion = '4.6'
wrapper {
gradleVersion = '5.1'
distributionType = Wrapper.DistributionType.ALL
}
@@ -81,7 +81,7 @@ task generateAccessorTestDex(type: JavaExec, dependsOn: compileAccessorTestJava)
def outputDex = file('src/test/resources/accessorTest.dex')
file(outputDex.parent).mkdirs()

inputs.dir(project.sourceSets.accessorTest.output.classesDir)
inputs.dir(project.sourceSets.accessorTest.output.classesDirs)
outputs.file outputDex

main 'com.android.dx.command.Main'
@@ -90,7 +90,7 @@ task generateAccessorTestDex(type: JavaExec, dependsOn: compileAccessorTestJava)
args '--dex'
args '--no-strict'
args "--output=${outputDex}"
args sourceSets.accessorTest.output.classesDir
args sourceSets.accessorTest.output.classesDirs
}

uploadArchives {
@@ -102,4 +102,4 @@ uploadArchives {
}
}
}
}
}
BIN +861 Bytes (100%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

0 comments on commit c70a700

Please sign in to comment.
You can’t perform that action at this time.