Skip to content

Commit 729dc5d

Browse files
committed
Gradle: Don't resolve classpath during configuration phase
1 parent 1da7311 commit 729dc5d

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

gradle/dokka.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ dokka {
3838
if (project.name != "kotlinx-coroutines-core") {
3939
dependsOn(project.configurations.compileClasspath)
4040
dependsOn(project.sourceSets.main.output)
41-
afterEvaluate {
41+
doFirst {
42+
// resolve classpath only during execution
4243
classpath = project.configurations.dokkaStubs.files + project.configurations.compileClasspath.files + project.sourceSets.main.output.files
4344
}
4445
}

ui/kotlinx-coroutines-android/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ class RunR8Task extends JavaExec {
4848
super.configure(closure)
4949
classpath = project.configurations.r8
5050
main = 'com.android.tools.r8.R8'
51+
return this
52+
}
5153

54+
@Override
55+
void exec() {
56+
// Resolve classpath only during execution
5257
def arguments = [
5358
'--release',
5459
'--no-desugaring',
@@ -59,11 +64,7 @@ class RunR8Task extends JavaExec {
5964
arguments.addAll(jarFile.absolutePath)
6065

6166
args = arguments
62-
return this
63-
}
6467

65-
@Override
66-
void exec() {
6768
if (outputDex.exists()) {
6869
outputDex.deleteDir()
6970
}

0 commit comments

Comments
 (0)