diff --git a/core/build.gradle b/core/build.gradle index 53e70a55..b66fcb62 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -16,7 +16,7 @@ project.ext.generatedSourceDir = file("$buildDir/generated-src/main/java/") sourceSets.main.java.srcDirs += generatedSourceDir idea.module.generatedSourceDirs += generatedSourceDir -project.ext.annotationProcessorGeneratedSourcesDirectory = compileJava.options.annotationProcessorGeneratedSourcesDirectory +project.ext.annotationProcessorGeneratedSourcesDirectory = compileJava.options.generatedSourceOutputDirectory sourceSets.main.java.srcDirs += annotationProcessorGeneratedSourcesDirectory idea.module.generatedSourceDirs += annotationProcessorGeneratedSourcesDirectory @@ -123,7 +123,7 @@ test { } weave { - classesDir = sourceSets.main.java.outputDir + classesDir = sourceSets.main.java.classesDirectory.get().getAsFile() enableArtemisPlugin = true enablePooledWeaving = true generateLinkMutators = true diff --git a/excel/excel-test/build.gradle b/excel/excel-test/build.gradle index 3c39f725..9af949ef 100644 --- a/excel/excel-test/build.gradle +++ b/excel/excel-test/build.gradle @@ -1,5 +1,5 @@ -sourceSets.main.java.srcDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory -idea.module.generatedSourceDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory +sourceSets.main.java.srcDirs += compileJava.options.generatedSourceOutputDirectory +idea.module.generatedSourceDirs += compileJava.options.generatedSourceOutputDirectory dependencies { annotationProcessor project(':excel:annotation-processor') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643e..e750102e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/table/integration/build.gradle b/table/integration/build.gradle index 12bd270c..0ab6b368 100644 --- a/table/integration/build.gradle +++ b/table/integration/build.gradle @@ -1,5 +1,5 @@ -sourceSets.main.java.srcDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory -idea.module.generatedSourceDirs += compileJava.options.annotationProcessorGeneratedSourcesDirectory +sourceSets.main.java.srcDirs += compileJava.options.generatedSourceOutputDirectory +idea.module.generatedSourceDirs += compileJava.options.generatedSourceOutputDirectory dependencies { annotationProcessor project(':table:annotation-processor')