Commit bffc4da 1 parent 18a2c42 commit bffc4da Copy full SHA for bffc4da
File tree 1 file changed +6
-9
lines changed
1 file changed +6
-9
lines changed Original file line number Diff line number Diff line change @@ -187,26 +187,23 @@ kotlin {
187
187
}
188
188
}
189
189
}
190
+
191
+ jvm {
192
+ withJava()
193
+ }
190
194
}
191
195
192
196
tasks {
193
- val compileModuleInfo by registering(JavaCompile ::class ) {
194
- classpath = objects.fileCollection()
195
- .from(configurations.named(" jvmCompileClasspath" ))
197
+ named<JavaCompile >(" compileJava" ) {
196
198
val compileKotlinJvm = named<KotlinCompile >(" compileKotlinJvm" )
197
199
dependsOn(compileKotlinJvm)
198
200
options.compilerArgumentProviders.plusAssign(CommandLineArgumentProvider {
199
201
listOf (" --patch-module" , " okio=${compileKotlinJvm.get().destinationDirectory.get().asFile.absolutePath} " )
200
202
})
201
- destinationDirectory = layout.buildDirectory.dir(" classes/java/moduleInfo" )
202
- options.release = 11
203
- source(layout.projectDirectory.dir(" src/jvmMain/java" ))
203
+ options.release.set(11 )
204
204
}
205
205
206
206
val jvmJar by getting(Jar ::class ) {
207
- // BundleTaskConvention() crashes unless there's a 'main' source set.
208
- sourceSets.create(SourceSet .MAIN_SOURCE_SET_NAME )
209
- from(compileModuleInfo)
210
207
val bndConvention = BundleTaskConvention (this )
211
208
bndConvention.setBnd(
212
209
"""
You can’t perform that action at this time.
0 commit comments