From cf91e7a28b99fa1bc48d9190091e26439ffb5519 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Tue, 13 Jun 2023 19:24:04 +0800 Subject: [PATCH] changed classes directory for secondary source directory sets --- gradle.properties | 4 ++-- .../gradle/multi/release/jar/MultiReleaseJarPlugin.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1ea8ada..c86adc1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ woggioniMavenRepositoryUrl=https://mvn.woggioni.net/ -lys.catalog.version=0.2-SNAPSHOT +lys.catalog.version=2023.06.11 -version.myGradlePlugins=2023.01 +version.myGradlePlugins=2023.06.13 version.gradle=7.6 version.felix.config.admin=1.9.26 version.felix=7.0.5 diff --git a/multi-release-jar/src/main/groovy/net/woggioni/gradle/multi/release/jar/MultiReleaseJarPlugin.groovy b/multi-release-jar/src/main/groovy/net/woggioni/gradle/multi/release/jar/MultiReleaseJarPlugin.groovy index cec96e2..b050eb9 100644 --- a/multi-release-jar/src/main/groovy/net/woggioni/gradle/multi/release/jar/MultiReleaseJarPlugin.groovy +++ b/multi-release-jar/src/main/groovy/net/woggioni/gradle/multi/release/jar/MultiReleaseJarPlugin.groovy @@ -147,7 +147,7 @@ class MultiReleaseJarPlugin implements Plugin { project.objects.sourceDirectorySet("java${javaVersion.majorVersion}", javaVersion.toString()) sourceDirectorySet.with { srcDir(new File(project.projectDir, "src/${mainSourceSet.name}/${sourceDirectorySet.name}")) - destinationDirectory.set(new File(project.buildDir, "classes/${sourceDirectorySet.name}")) + destinationDirectory.set(new File(project.buildDir, "classes/${mainSourceSet.name}/${sourceDirectorySet.name}")) sourcePaths << sourceDirectories } new DslObject(mainSourceSet).getConvention().getPlugins().put(sourceDirectorySet.name, sourceDirectorySet)