Skip to content

Commit 20507e7

Browse files
committed
- fixed patching (wrong module name)
- removed src duplications and strategy
1 parent d93c848 commit 20507e7

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ allprojects {
2020
apply(plugin = "com.github.johnrengelman.shadow")
2121

2222
// version = "0.9-beta"
23+
group = "com.github.kotlin_graphics"
2324

2425
java {
2526
modularity.inferModulePath.set(true)
@@ -57,9 +58,7 @@ allprojects {
5758
freeCompilerArgs = listOf("-XXLanguage:+InlineClasses", "-Xjvm-default=enable")
5859
}
5960
sourceCompatibility = "11"
60-
destinationDir = compileJava.get().destinationDir
6161
}
62-
jar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE }
6362

6463
compileTestKotlin {
6564
kotlinOptions.jvmTarget = "11"

uno-core/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ dependencies {
2828
}
2929
}
3030

31-
tasks {
32-
compileJava {
33-
// this is needed because we have a separate compile step in this example with the 'module-info.java' is in 'main/java' and the Kotlin code is in 'main/kotlin'
34-
options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}")
35-
}
31+
tasks.compileJava {
32+
// this is needed because we have a separate compile step in this example with the 'module-info.java' is in 'main/java' and the Kotlin code is in 'main/kotlin'
33+
options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}")
3634
}

uno-vk/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ dependencies {
2323
}
2424
}
2525

26-
tasks {
27-
compileJava {
28-
// this is needed because we have a separate compile step in this example with the 'module-info.java' is in 'main/java' and the Kotlin code is in 'main/kotlin'
29-
options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}")
30-
}
26+
tasks.compileJava {
27+
// this is needed because we have a separate compile step in this example with the 'module-info.java' is in 'main/java' and the Kotlin code is in 'main/kotlin'
28+
options.compilerArgs = listOf("--patch-module", "$moduleName=${sourceSets.main.get().output.asPath}")
3129
}

0 commit comments

Comments
 (0)