Skip to content

Commit 032ea46

Browse files
committed
Update to the newest version of Gradle
1 parent 7b88a15 commit 032ea46

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

gradle/wrapper/gradle-wrapper.jar

80 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

kotlin-guiced.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ subprojects {
108108
}
109109

110110
val sourceJarTask = task<Jar>("sourceJar") {
111-
from(the<JavaPluginConvention>().sourceSets["main"].allSource)
111+
from(java.sourceSets["main"].allSource)
112112
classifier = "sources"
113113
}
114114

@@ -143,7 +143,7 @@ val jacocoRootReport = task<JacocoReport>("jacocoRootReport") {
143143

144144
subprojects.forEach { testedProject ->
145145
val sourceSets = testedProject.java.sourceSets
146-
this@task.additionalSourceDirs += files(sourceSets["main"].allSource.srcDirs)
146+
this@task.additionalSourceDirs = this@task.additionalSourceDirs?.plus(files(sourceSets["main"].allSource.srcDirs))
147147
this@task.sourceDirectories += files(sourceSets["main"].allSource.srcDirs)
148148
this@task.classDirectories += files(sourceSets["main"].output)
149149
}
@@ -169,7 +169,7 @@ configurations.create(PUBLISHED_CONFIGURATION_NAME)
169169

170170
task<Wrapper>("wrapper") {
171171
description = "Configure the version of gradle to download and use"
172-
gradleVersion = "4.4.1"
172+
gradleVersion = "4.7"
173173
distributionType = Wrapper.DistributionType.ALL
174174
}
175175

0 commit comments

Comments
 (0)